diff --git a/src/machine/board_itsybitsy-m0.go b/src/machine/board_itsybitsy-m0.go
index 86998f4c..d43f870b 100644
--- a/src/machine/board_itsybitsy-m0.go
+++ b/src/machine/board_itsybitsy-m0.go
@@ -1,4 +1,4 @@
-// +build sam,atsamd21g18a,itsybitsy_m0
+// +build sam,atsamd21,itsybitsy_m0
 
 package machine
 
diff --git a/src/machine/machine_atsamd21g18.go b/src/machine/machine_atsamd21.go
similarity index 99%
rename from src/machine/machine_atsamd21g18.go
rename to src/machine/machine_atsamd21.go
index 1747672c..608dffba 100644
--- a/src/machine/machine_atsamd21g18.go
+++ b/src/machine/machine_atsamd21.go
@@ -1,4 +1,4 @@
-// +build sam,atsamd21g18a
+// +build sam,atsamd21
 
 // Peripheral abstraction layer for the atsamd21.
 //
diff --git a/src/runtime/runtime_atsamd21g18.go b/src/runtime/runtime_atsamd21.go
similarity index 99%
rename from src/runtime/runtime_atsamd21g18.go
rename to src/runtime/runtime_atsamd21.go
index 40e8cff4..80fba9b9 100644
--- a/src/runtime/runtime_atsamd21g18.go
+++ b/src/runtime/runtime_atsamd21.go
@@ -1,4 +1,4 @@
-// +build sam,atsamd21g18a
+// +build sam,atsamd21
 
 package runtime
 
diff --git a/targets/atsamd21g18.ld b/targets/atsamd21.ld
similarity index 100%
rename from targets/atsamd21g18.ld
rename to targets/atsamd21.ld
diff --git a/targets/atsamd21g18.json b/targets/atsamd21g18a.json
similarity index 72%
rename from targets/atsamd21g18.json
rename to targets/atsamd21g18a.json
index c0d48400..4ccaa3ae 100644
--- a/targets/atsamd21g18.json
+++ b/targets/atsamd21g18a.json
@@ -1,13 +1,13 @@
 {
 	"inherits": ["cortex-m"],
 	"llvm-target": "armv6m-none-eabi",
-	"build-tags": ["atsamd21g18", "sam"],
+	"build-tags": ["atsamd21g18", "atsamd21", "sam"],
 	"cflags": [
 		"--target=armv6m-none-eabi",
 		"-Qunused-arguments"
 	],
 	"ldflags": [
-		"-T", "targets/atsamd21g18.ld"
+		"-T", "targets/atsamd21.ld"
 	],
 	"extra-files": [
 		"src/device/sam/atsamd21g18a.s"
diff --git a/targets/itsybitsy-m0.json b/targets/itsybitsy-m0.json
index a38ce5c3..0cde6d43 100644
--- a/targets/itsybitsy-m0.json
+++ b/targets/itsybitsy-m0.json
@@ -1,5 +1,5 @@
 {
-    "inherits": ["atsamd21g18"],
+    "inherits": ["atsamd21g18a"],
     "build-tags": ["sam", "atsamd21g18a", "itsybitsy_m0"],
     "flash": "bossac -d -i -e -w -v -R --offset=0x2000 {hex}"
 }