diff --git a/src/emucore/tia/Background.hxx b/src/emucore/tia/Background.hxx
index cff95763f..ae7bc8562 100644
--- a/src/emucore/tia/Background.hxx
+++ b/src/emucore/tia/Background.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_BACKGROUND
-#define TIA_6502TS_CORE_BACKGROUND
+#ifndef TIA_BACKGROUND
+#define TIA_BACKGROUND
 
 #include "Serializable.hxx"
 #include "bspf.hxx"
@@ -57,4 +57,4 @@ class Background : public Serializable
     Background& operator=(Background&&);
 };
 
-#endif // TIA_6502TS_CORE_BACKGROUND
+#endif // TIA_BACKGROUND
diff --git a/src/emucore/tia/Ball.hxx b/src/emucore/tia/Ball.hxx
index 4b73ea003..3a45e5640 100644
--- a/src/emucore/tia/Ball.hxx
+++ b/src/emucore/tia/Ball.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_BALL
-#define TIA_6502TS_CORE_BALL
+#ifndef TIA_BALL
+#define TIA_BALL
 
 #include "Serializable.hxx"
 #include "bspf.hxx"
@@ -116,4 +116,4 @@ class Ball : public Serializable
     Ball& operator=(Ball&&);
 };
 
-#endif // TIA_6502TS_CORE_BALL
+#endif // TIA_BALL
diff --git a/src/emucore/tia/DelayQueue.hxx b/src/emucore/tia/DelayQueue.hxx
index f52210f54..a5b68aba7 100644
--- a/src/emucore/tia/DelayQueue.hxx
+++ b/src/emucore/tia/DelayQueue.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_DELAY_QUEUE
-#define TIA_6502TS_CORE_DELAY_QUEUE
+#ifndef TIA_DELAY_QUEUE
+#define TIA_DELAY_QUEUE
 
 #include "bspf.hxx"
 #include "DelayQueueMember.hxx"
@@ -68,4 +68,4 @@ template<class T> void DelayQueue::execute(T executor)
   myIndex = (myIndex + 1) % myMembers.size();
 }
 
-#endif //  TIA_6502TS_CORE_DELAY_QUEUE
+#endif //  TIA_DELAY_QUEUE
diff --git a/src/emucore/tia/DelayQueueMember.hxx b/src/emucore/tia/DelayQueueMember.hxx
index 3333b2942..e9025e0eb 100644
--- a/src/emucore/tia/DelayQueueMember.hxx
+++ b/src/emucore/tia/DelayQueueMember.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_DELAY_QUEUE_MEMBER
-#define TIA_6502TS_CORE_DELAY_QUEUE_MEMBER
+#ifndef TIA_DELAY_QUEUE_MEMBER
+#define TIA_DELAY_QUEUE_MEMBER
 
 #include "bspf.hxx"
 
@@ -68,4 +68,4 @@ class DelayQueueMember
 
 };
 
-#endif //  TIA_6502TS_CORE_DELAY_QUEUE_MEMBER
+#endif //  TIA_DELAY_QUEUE_MEMBER
diff --git a/src/emucore/tia/DrawCounterDecodes.hxx b/src/emucore/tia/DrawCounterDecodes.hxx
index 82f8cd175..f8d55ea14 100644
--- a/src/emucore/tia/DrawCounterDecodes.hxx
+++ b/src/emucore/tia/DrawCounterDecodes.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_DRAW_COUNTER_DECODES
-#define TIA_6502TS_CORE_DRAW_COUNTER_DECODES
+#ifndef TIA_DRAW_COUNTER_DECODES
+#define TIA_DRAW_COUNTER_DECODES
 
 #include "bspf.hxx"
 
@@ -52,4 +52,4 @@ class DrawCounterDecodes
     DrawCounterDecodes& operator=(DrawCounterDecodes&&) = delete;
 };
 
-#endif // TIA_6502TS_CORE_DRAW_COUNTER_DECODES
+#endif // TIA_DRAW_COUNTER_DECODES
diff --git a/src/emucore/tia/FrameManager.hxx b/src/emucore/tia/FrameManager.hxx
index 291eee41a..53f717dc5 100644
--- a/src/emucore/tia/FrameManager.hxx
+++ b/src/emucore/tia/FrameManager.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_FRAME_MANAGER
-#define TIA_6502TS_CORE_FRAME_MANAGER
+#ifndef TIA_FRAME_MANAGER
+#define TIA_FRAME_MANAGER
 
 #include <functional>
 
@@ -103,6 +103,7 @@ class FrameManager : public Serializable
     enum VblankMode {
       locked,
       floating,
+      final,
       fixed
     };
 
@@ -161,4 +162,4 @@ class FrameManager : public Serializable
     FrameManager& operator=(FrameManager&&) = delete;
 };
 
-#endif // TIA_6502TS_CORE_FRAME_MANAGER
+#endif // TIA_FRAME_MANAGER
diff --git a/src/emucore/tia/LatchedInput.hxx b/src/emucore/tia/LatchedInput.hxx
index b23a587d2..2ff900c9c 100644
--- a/src/emucore/tia/LatchedInput.hxx
+++ b/src/emucore/tia/LatchedInput.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_LATCHED_INPUT
-#define TIA_6502TS_CORE_LATCHED_INPUT
+#ifndef TIA_LATCHED_INPUT
+#define TIA_LATCHED_INPUT
 
 #include "bspf.hxx"
 
@@ -46,4 +46,4 @@ class LatchedInput
     LatchedInput& operator=(LatchedInput&&) = delete;
 };
 
-#endif // TIA_6502TS_CORE_LATCHED_INPUT
+#endif // TIA_LATCHED_INPUT
diff --git a/src/emucore/tia/Missile.hxx b/src/emucore/tia/Missile.hxx
index 8323c53ea..40862ba8a 100644
--- a/src/emucore/tia/Missile.hxx
+++ b/src/emucore/tia/Missile.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_MISSILE
-#define TIA_6502TS_CORE_MISSILE
+#ifndef TIA_MISSILE
+#define TIA_MISSILE
 
 #include "Serializable.hxx"
 #include "bspf.hxx"
@@ -114,4 +114,4 @@ class Missile : public Serializable
     Missile& operator=(Missile&&) = delete;
 };
 
-#endif // TIA_6502TS_CORE_MISSILE
+#endif // TIA_MISSILE
diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx
index 5c697497d..028366286 100644
--- a/src/emucore/tia/PaddleReader.hxx
+++ b/src/emucore/tia/PaddleReader.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_PADDLE_READER
-#define TIA_6502TS_CORE_PADDLE_READER
+#ifndef TIA_PADDLE_READER
+#define TIA_PADDLE_READER
 
 #include "bspf.hxx"
 #include "TvMode.hxx"
@@ -64,4 +64,4 @@ class PaddleReader
     PaddleReader& operator=(PaddleReader&&) = delete;
 };
 
-#endif // TIA_6502TS_CORE_PADDLE_READER
+#endif // TIA_PADDLE_READER
diff --git a/src/emucore/tia/Player.hxx b/src/emucore/tia/Player.hxx
index 067e92abb..122d3dd6d 100644
--- a/src/emucore/tia/Player.hxx
+++ b/src/emucore/tia/Player.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_PLAYER
-#define TIA_6502TS_CORE_PLAYER
+#ifndef TIA_PLAYER
+#define TIA_PLAYER
 
 #include "Serializable.hxx"
 #include "bspf.hxx"
@@ -123,4 +123,4 @@ class Player : public Serializable
     Player& operator=(Player&&) = delete;
 };
 
-#endif // TIA_6502TS_CORE_PLAYER
+#endif // TIA_PLAYER
diff --git a/src/emucore/tia/Playfield.hxx b/src/emucore/tia/Playfield.hxx
index 4a7d8d6fd..1f5d1a70c 100644
--- a/src/emucore/tia/Playfield.hxx
+++ b/src/emucore/tia/Playfield.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_PLAYFIELD
-#define TIA_6502TS_CORE_PLAYFIELD
+#ifndef TIA_PLAYFIELD
+#define TIA_PLAYFIELD
 
 #include "Serializable.hxx"
 #include "bspf.hxx"
@@ -117,4 +117,4 @@ class Playfield : public Serializable
     Playfield& operator=(Playfield&&) = delete;
 };
 
-#endif // TIA_6502TS_CORE_PLAYFIELD
+#endif // TIA_PLAYFIELD
diff --git a/src/emucore/tia/TIA.hxx b/src/emucore/tia/TIA.hxx
index f2783a50d..6d2b302b8 100644
--- a/src/emucore/tia/TIA.hxx
+++ b/src/emucore/tia/TIA.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_TIA
-#define TIA_6502TS_CORE_TIA
+#ifndef TIA_TIA
+#define TIA_TIA
 
 #include "bspf.hxx"
 #include "Sound.hxx"
@@ -463,4 +463,4 @@ class TIA : public Device
     TIA& operator=(TIA&&) = delete;
 };
 
-#endif // TIA_6502TS_CORE_TIA
+#endif // TIA_TIA
diff --git a/src/emucore/tia/TvMode.hxx b/src/emucore/tia/TvMode.hxx
index 619078189..913777e2e 100644
--- a/src/emucore/tia/TvMode.hxx
+++ b/src/emucore/tia/TvMode.hxx
@@ -15,11 +15,11 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef TIA_6502TS_CORE_TYPES
-#define TIA_6502TS_CORE_TYPES
+#ifndef TIA_TYPES
+#define TIA_TYPES
 
 enum TvMode {
   pal, ntsc
 };
 
-#endif // TIA_6502TS_CORE_TYPES
+#endif // TIA_TYPES