diff --git a/Makefile b/Makefile
index 4447d746..154816f4 100644
--- a/Makefile
+++ b/Makefile
@@ -564,7 +564,7 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=particle-xenon      examples/blinky1
 	@$(MD5SUM) test.hex
-	$(TINYGO) build -size short -o test.hex -target=pinetime-devkit0    examples/blinky1
+	$(TINYGO) build -size short -o test.hex -target=pinetime            examples/blinky1
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=x9pro               examples/blinky1
 	@$(MD5SUM) test.hex
diff --git a/src/machine/board_pinetime-devkit0.go b/src/machine/board_pinetime.go
similarity index 81%
rename from src/machine/board_pinetime-devkit0.go
rename to src/machine/board_pinetime.go
index 26a557cb..f7a137bc 100644
--- a/src/machine/board_pinetime-devkit0.go
+++ b/src/machine/board_pinetime.go
@@ -1,4 +1,4 @@
-//go:build pinetime_devkit0
+//go:build pinetime
 
 package machine
 
@@ -17,13 +17,10 @@ const (
 	LED  = LED1
 )
 
-var DefaultUART = UART0
-
-// UART pins for PineTime. Note that RX is set to NoPin as RXD is not listed in
-// the PineTime schematic 1.0:
-// http://files.pine64.org/doc/PineTime/PineTime%20Port%20Assignment%20rev1.0.pdf
+// The PineTime doesn't have a UART output.
+// Additionally, leaving the UART on results in a pretty big current drain.
 const (
-	UART_TX_PIN Pin = 11 // TP29 (TXD)
+	UART_TX_PIN Pin = NoPin
 	UART_RX_PIN Pin = NoPin
 )
 
diff --git a/targets/pinetime-devkit0.json b/targets/pinetime.json
similarity index 77%
rename from targets/pinetime-devkit0.json
rename to targets/pinetime.json
index 8655769e..1ba8a0e7 100644
--- a/targets/pinetime-devkit0.json
+++ b/targets/pinetime.json
@@ -1,7 +1,7 @@
 {
 	"inherits": ["nrf52"],
-	"build-tags": ["pinetime_devkit0"],
-	"serial": "uart",
+	"build-tags": ["pinetime"],
+	"serial": "none",
 	"flash-method": "openocd",
 	"flash-command": "nrfjprog -f nrf52 --sectorerase --program {hex} --reset",
 	"openocd-interface": "jlink",