diff --git a/Components/9918/9918.hpp b/Components/9918/9918.hpp
index a3a80ea66..d49a33fad 100644
--- a/Components/9918/9918.hpp
+++ b/Components/9918/9918.hpp
@@ -14,8 +14,7 @@
 
 #include <cstdint>
 
-namespace TI {
-namespace TMS {
+namespace TI::TMS {
 
 enum Personality {
 	TMS9918A,	// includes the 9928 and 9929; set TV standard and output device as desired.
@@ -36,13 +35,11 @@ enum class TVStandard {
 	NTSC
 };
 
-}
 }
 
 #include "Implementation/9918Base.hpp"
 
-namespace TI {
-namespace TMS {
+namespace TI::TMS {
 
 /*!
 	Provides emulation of the TMS9918a, TMS9928 and TMS9929. Likely in the future to be the
@@ -127,7 +124,6 @@ template <Personality personality> class TMS9918: private Base<personality> {
 		bool get_interrupt_line() const;
 };
 
-}
 }
 
 #endif /* TMS9918_hpp */
diff --git a/Components/9918/Implementation/9918Base.hpp b/Components/9918/Implementation/9918Base.hpp
index f2d4d574b..26e9e4fad 100644
--- a/Components/9918/Implementation/9918Base.hpp
+++ b/Components/9918/Implementation/9918Base.hpp
@@ -28,8 +28,7 @@
 #include <memory>
 #include <vector>
 
-namespace TI {
-namespace TMS {
+namespace TI::TMS {
 
 constexpr uint8_t StatusInterrupt = 0x80;
 constexpr uint8_t StatusSpriteOverflow = 0x40;
@@ -622,7 +621,6 @@ template <Personality personality> struct Base: public Storage<personality> {
 #include "Fetch.hpp"
 #include "Draw.hpp"
 
-}
 }
 
 #endif /* TMS9918Base_hpp */
diff --git a/Components/9918/Implementation/AccessEnums.hpp b/Components/9918/Implementation/AccessEnums.hpp
index d5e581b7f..aa2328cc2 100644
--- a/Components/9918/Implementation/AccessEnums.hpp
+++ b/Components/9918/Implementation/AccessEnums.hpp
@@ -10,8 +10,7 @@
 #define AccessEnums_hpp
 
 
-namespace TI {
-namespace TMS {
+namespace TI::TMS {
 
 // The screen mode is a necessary predecessor to picking the line mode,
 // which is the thing latched per line.
@@ -108,7 +107,6 @@ enum class SpriteMode {
 	MasterSystem,
 };
 
-}
 }
 
 #endif /* AccessEnums_hpp */
diff --git a/Components/9918/Implementation/ClockConverter.hpp b/Components/9918/Implementation/ClockConverter.hpp
index 5d961a184..89427c439 100644
--- a/Components/9918/Implementation/ClockConverter.hpp
+++ b/Components/9918/Implementation/ClockConverter.hpp
@@ -12,8 +12,7 @@
 #include "../9918.hpp"
 #include "PersonalityTraits.hpp"
 
-namespace TI {
-namespace TMS {
+namespace TI::TMS {
 
 enum class Clock {
 	Internal,
@@ -215,7 +214,6 @@ template <Personality personality> struct LineLayout<personality, std::enable_if
 	constexpr static int EndOfRightBorder	= 1341;
 };
 
-}
 }
 
 #endif /* ClockConverter_hpp */
diff --git a/Components/9918/Implementation/PersonalityTraits.hpp b/Components/9918/Implementation/PersonalityTraits.hpp
index 09511798c..7a4fd013c 100644
--- a/Components/9918/Implementation/PersonalityTraits.hpp
+++ b/Components/9918/Implementation/PersonalityTraits.hpp
@@ -9,8 +9,7 @@
 #ifndef PersonalityTraits_hpp
 #define PersonalityTraits_hpp
 
-namespace TI {
-namespace TMS {
+namespace TI::TMS {
 
 // Genus determinants for the various personalityes.
 constexpr bool is_sega_vdp(Personality p) {
@@ -47,7 +46,5 @@ constexpr size_t memory_mask(Personality p) {
 }
 
 }
-}
-
 
 #endif /* PersonalityTraits_hpp */
diff --git a/Components/9918/Implementation/Storage.hpp b/Components/9918/Implementation/Storage.hpp
index b98c74892..4d6d0da4e 100644
--- a/Components/9918/Implementation/Storage.hpp
+++ b/Components/9918/Implementation/Storage.hpp
@@ -15,8 +15,7 @@
 
 #include <optional>
 
-namespace TI {
-namespace TMS {
+namespace TI::TMS {
 
 /// A container for personality-specific storage; see specific instances below.
 template <Personality personality, typename Enable = void> struct Storage {
@@ -493,7 +492,6 @@ template <Personality personality> struct Storage<personality, std::enable_if_t<
 	void begin_line(ScreenMode, bool) {}
 };
 
-}
 }
 
 #endif /* Storage_h */