diff --git a/resource/version.h b/resource/version.h
index 55d7f48c..ee8c56c1 100644
--- a/resource/version.h
+++ b/resource/version.h
@@ -1,4 +1,4 @@
-#define APPLEWIN_VERSION 1,31,0,1
+#define APPLEWIN_VERSION 1,31,0,2
 
 #define xstr(a) str(a)
 #define str(a) #a
diff --git a/source/Card.h b/source/Card.h
index a4c30c52..ff5cd2a8 100644
--- a/source/Card.h
+++ b/source/Card.h
@@ -3,7 +3,7 @@
 enum SS_CARDTYPE
 {
 	CT_Empty = 0,
-	CT_Disk2,			// Apple Disk][
+	CT_Disk2,			// Apple Disk II
 	CT_SSC,				// Apple Super Serial Card
 	CT_MockingboardC,	// Soundcard
 	CT_GenericPrinter,
diff --git a/source/Disk.cpp b/source/Disk.cpp
index f330bb27..61a24ece 100644
--- a/source/Disk.cpp
+++ b/source/Disk.cpp
@@ -2239,8 +2239,6 @@ BYTE __stdcall Disk2InterfaceCard::IOWrite(WORD pc, WORD addr, BYTE bWrite, BYTE
 // 9: Added: absolute path
 static const UINT kUNIT_VERSION = 9;
 
-#define SS_YAML_VALUE_CARD_DISK2 "Disk]["
-
 #define SS_YAML_KEY_PHASES "Phases"
 #define SS_YAML_KEY_CURRENT_DRIVE "Current Drive"
 #define SS_YAML_KEY_DISK_ACCESSED "Disk Accessed"	// deprecated at v7
@@ -2284,7 +2282,7 @@ static const UINT kUNIT_VERSION = 9;
 
 const std::string& Disk2InterfaceCard::GetSnapshotCardName(void)
 {
-	static const std::string name(SS_YAML_VALUE_CARD_DISK2);
+	static const std::string name("Disk][");
 	return name;
 }
 
diff --git a/source/Harddisk.cpp b/source/Harddisk.cpp
index e94adadc..faafc55e 100644
--- a/source/Harddisk.cpp
+++ b/source/Harddisk.cpp
@@ -1238,8 +1238,6 @@ bool HarddiskInterfaceCard::ImageSwap(void)
 // 6: Added: absolute path
 static const UINT kUNIT_VERSION = 6;
 
-#define SS_YAML_VALUE_CARD_HDD "Generic HDD"
-
 #define SS_YAML_KEY_CURRENT_UNIT "Current Unit"
 #define SS_YAML_KEY_COMMAND "Command"
 
@@ -1261,7 +1259,7 @@ static const UINT kUNIT_VERSION = 6;
 
 const std::string& HarddiskInterfaceCard::GetSnapshotCardName(void)
 {
-	static const std::string name(SS_YAML_VALUE_CARD_HDD);
+	static const std::string name("Generic HDD");
 	return name;
 }
 
diff --git a/source/LanguageCard.cpp b/source/LanguageCard.cpp
index 31bcdd0e..f38e4c3f 100644
--- a/source/LanguageCard.cpp
+++ b/source/LanguageCard.cpp
@@ -221,8 +221,6 @@ LanguageCardSlot0::~LanguageCardSlot0(void)
 
 static const UINT kUNIT_LANGUAGECARD_VER = 1;
 
-#define SS_YAML_VALUE_CARD_LANGUAGECARD "Language Card"
-
 #define SS_YAML_KEY_MEMORYMODE "Memory Mode"
 #define SS_YAML_KEY_LASTRAMWRITE "Last RAM Write"
 
@@ -234,7 +232,7 @@ const std::string& LanguageCardSlot0::GetSnapshotMemStructName(void)
 
 const std::string& LanguageCardSlot0::GetSnapshotCardName(void)
 {
-	static const std::string name(SS_YAML_VALUE_CARD_LANGUAGECARD);
+	static const std::string name("Language Card");
 	return name;
 }
 
@@ -440,8 +438,6 @@ BYTE __stdcall Saturn128K::IO(WORD PC, WORD uAddr, BYTE bWrite, BYTE uValue, ULO
 
 static const UINT kUNIT_SATURN_VER = 1;
 
-#define SS_YAML_VALUE_CARD_SATURN128 "Saturn 128"
-
 #define SS_YAML_KEY_NUM_SATURN_BANKS "Num Saturn Banks"
 #define SS_YAML_KEY_ACTIVE_SATURN_BANK "Active Saturn Bank"
 
@@ -453,7 +449,7 @@ const std::string& Saturn128K::GetSnapshotMemStructName(void)
 
 const std::string& Saturn128K::GetSnapshotCardName(void)
 {
-	static const std::string name(SS_YAML_VALUE_CARD_SATURN128);
+	static const std::string name("Saturn 128");
 	return name;
 }
 
diff --git a/source/MouseInterface.cpp b/source/MouseInterface.cpp
index 8b1b4060..9504b334 100644
--- a/source/MouseInterface.cpp
+++ b/source/MouseInterface.cpp
@@ -601,8 +601,6 @@ void CMouseInterface::SetButton(eBUTTON Button, eBUTTONSTATE State)
 	OnMouseEvent();
 }
 
-#define SS_YAML_VALUE_CARD_MOUSE "Mouse Card"
-
 #define SS_YAML_KEY_MC6821 "MC6821"
 #define SS_YAML_KEY_PRA "PRA"
 #define SS_YAML_KEY_DDRA "DDRA"
@@ -637,7 +635,7 @@ void CMouseInterface::SetButton(eBUTTON Button, eBUTTONSTATE State)
 
 const std::string& CMouseInterface::GetSnapshotCardName(void)
 {
-	static const std::string name(SS_YAML_VALUE_CARD_MOUSE);
+	static const std::string name("Mouse Card");
 	return name;
 }
 
diff --git a/source/ParallelPrinter.cpp b/source/ParallelPrinter.cpp
index cff9462d..ef78da71 100644
--- a/source/ParallelPrinter.cpp
+++ b/source/ParallelPrinter.cpp
@@ -225,8 +225,6 @@ void ParallelPrinterCard::SetRegistryConfig(void)
 
 //===========================================================================
 
-#define SS_YAML_VALUE_CARD_PRINTER "Generic Printer"
-
 #define SS_YAML_KEY_INACTIVITY "Inactivity"
 #define SS_YAML_KEY_IDLELIMIT "Printer Idle Limit"
 #define SS_YAML_KEY_FILENAME "Print Filename"
@@ -239,7 +237,7 @@ void ParallelPrinterCard::SetRegistryConfig(void)
 
 const std::string& ParallelPrinterCard::GetSnapshotCardName(void)
 {
-	static const std::string name(SS_YAML_VALUE_CARD_PRINTER);
+	static const std::string name("Generic Printer");
 	return name;
 }
 
diff --git a/source/SerialComms.cpp b/source/SerialComms.cpp
index c3e40a72..b50eef65 100644
--- a/source/SerialComms.cpp
+++ b/source/SerialComms.cpp
@@ -1408,8 +1408,6 @@ void CSuperSerialCard::SetRegistrySerialPortName(void)
 //    Removed: redundant data (encapsulated in Command & Control bytes)
 static const UINT kUNIT_VERSION = 2;
 
-#define SS_YAML_VALUE_CARD_SSC "Super Serial Card"
-
 #define SS_YAML_KEY_DIPSWDEFAULT "DIPSW Default"
 #define SS_YAML_KEY_DIPSWCURRENT "DIPSW Current"
 
@@ -1433,7 +1431,7 @@ static const UINT kUNIT_VERSION = 2;
 
 const std::string& CSuperSerialCard::GetSnapshotCardName(void)
 {
-	static const std::string name(SS_YAML_VALUE_CARD_SSC);
+	static const std::string name("Super Serial Card");
 	return name;
 }
 
diff --git a/source/Z80VICE/z80.cpp b/source/Z80VICE/z80.cpp
index 03d29204..3657fcf9 100644
--- a/source/Z80VICE/z80.cpp
+++ b/source/Z80VICE/z80.cpp
@@ -6429,8 +6429,6 @@ void z80_WRMEM(WORD Addr, BYTE Value)
 
 //===========================================================================
 
-#define SS_YAML_VALUE_CARD_Z80 "Z80"
-
 #define SS_YAML_KEY_REGA "A"
 #define SS_YAML_KEY_REGB "B"
 #define SS_YAML_KEY_REGC "C"
@@ -6460,7 +6458,7 @@ void z80_WRMEM(WORD Addr, BYTE Value)
 
 const std::string& Z80_GetSnapshotCardName(void)
 {
-	static const std::string name(SS_YAML_VALUE_CARD_Z80);
+	static const std::string name("Z80");
 	return name;
 }