diff --git a/data/memories.yaml b/data/memories.yaml
index 88ee797..5d51f8b 100644
--- a/data/memories.yaml
+++ b/data/memories.yaml
@@ -304,7 +304,7 @@
 - device-id: 0x440
   names:
   - STM32F05x
-  - STMF030x8
+  - STM32F030x8
   ram:
     address: 0x20000000
     bytes: 0x1ff8
@@ -323,7 +323,7 @@
 - device-id: 0x442
   names:
   - STM32F09x
-  - STMF030xC
+  - STM32F030xC
   ram:
     address: 0x20000000
     bytes: 0x8000
@@ -351,7 +351,7 @@
 - device-id: 0x445
   names:
   - STM32F04x
-  - STMF070x6
+  - STM32F070x6
   ram:
     address: 0x20000000
     bytes: 0x1800
diff --git a/util/parse_memory.py b/util/parse_memory.py
index 2331c63..661e961 100644
--- a/util/parse_memory.py
+++ b/util/parse_memory.py
@@ -35,6 +35,8 @@ def splat_names(base, parts):
     for part in parts:
         if part.startswith("STM32"):
             names.append( base )
+        elif part.startswith( base[5]):
+            names.append('STM32' + part)
         else:
             names.append( base[0: len(base) - len(part)] + part)
 
@@ -56,6 +58,8 @@ def split_names(str):
         elif name.startswith("STM32"):
             current_base = name
             cleaned.append(name)
+        elif name.startswith( current_base[5]):
+            names.append('STM32' + name)
         else:
             cleaned.append( current_base[0: len(current_base) - len(name)] + name)
     return cleaned