diff --git a/common/patches/client_version.cpp b/common/patches/client_version.cpp
index ca58711fc..764fc2bec 100644
--- a/common/patches/client_version.cpp
+++ b/common/patches/client_version.cpp
@@ -40,24 +40,24 @@ struct ClientComponents
 			messageComponent = std::make_unique<Message::TOB>();
 			break;
 		case Version::RoF2:
-			buffComponent = std::make_unique<Buff::RoF2>();
-			messageComponent = std::make_unique<Message::RoF2>();
+			buffComponent = std::make_unique<Buff::UF>();
+			messageComponent = std::make_unique<Message::Titanium>();
 			break;
 		case Version::RoF:
-			buffComponent = std::make_unique<Buff::RoF>();
-			messageComponent = std::make_unique<Message::RoF>();
+			buffComponent = std::make_unique<Buff::UF>();
+			messageComponent = std::make_unique<Message::Titanium>();
 			break;
 		case Version::UF:
 			buffComponent = std::make_unique<Buff::UF>();
-			messageComponent = std::make_unique<Message::UF>();
+			messageComponent = std::make_unique<Message::Titanium>();
 			break;
 		case Version::SoD:
 			buffComponent = std::make_unique<Buff::SoD>();
-			messageComponent = std::make_unique<Message::SoD>();
+			messageComponent = std::make_unique<Message::Titanium>();
 			break;
 		case Version::SoF:
-			buffComponent = std::make_unique<Buff::SoF>();
-			messageComponent = std::make_unique<Message::SoF>();
+			buffComponent = std::make_unique<Buff::Titanium>();
+			messageComponent = std::make_unique<Message::Titanium>();
 			break;
 		case Version::Titanium:
 			buffComponent = std::make_unique<Buff::Titanium>();
diff --git a/common/patches/rof.h b/common/patches/rof.h
index 373524c65..6f7143b9f 100644
--- a/common/patches/rof.h
+++ b/common/patches/rof.h
@@ -49,25 +49,3 @@ namespace RoF
 	};
 
 } /*RoF*/
-
-namespace Message {
-
-class RoF : public UF
-{
-public:
-	RoF() = default;
-	~RoF() override = default;
-};
-
-} // namespace Message
-
-namespace Buff {
-
-class RoF : public UF
-{
-public:
-	RoF() = default;
-	~RoF() override = default;
-};
-
-} // namespace Buff
diff --git a/common/patches/rof2.h b/common/patches/rof2.h
index 31ce661b1..8c3e77124 100644
--- a/common/patches/rof2.h
+++ b/common/patches/rof2.h
@@ -49,25 +49,3 @@ namespace RoF2
 	};
 
 }; /*RoF2*/
-
-namespace Message {
-
-class RoF2 : public RoF
-{
-public:
-	RoF2() = default;
-	~RoF2() override = default;
-};
-
-} // namespace Message
-
-namespace Buff {
-
-class RoF2 : public RoF
-{
-public:
-	RoF2() = default;
-	~RoF2() override = default;
-};
-
-} // namespace Buff
diff --git a/common/patches/sod.h b/common/patches/sod.h
index f9b4f3f89..34c730bb1 100644
--- a/common/patches/sod.h
+++ b/common/patches/sod.h
@@ -50,20 +50,9 @@ namespace SoD
 
 } /*SoD*/
 
-namespace Message {
-
-class SoD : public SoF
-{
-public:
-	SoD() = default;
-	~SoD() override = default;
-};
-
-} // namespace Message
-
 namespace Buff {
 
-class SoD : public SoF
+class SoD : public Titanium
 {
 public:
 	SoD() = default;
diff --git a/common/patches/sof.h b/common/patches/sof.h
index 374c3d7f8..8e7537828 100644
--- a/common/patches/sof.h
+++ b/common/patches/sof.h
@@ -49,25 +49,3 @@ namespace SoF
 	};
 
 } /*SoF*/
-
-namespace Message {
-
-class SoF : public Titanium
-{
-public:
-	SoF() = default;
-	~SoF() override = default;
-};
-
-} // namespace Message
-
-namespace Buff {
-
-class SoF : public Titanium
-{
-public:
-	SoF() = default;
-	~SoF() override = default;
-};
-
-} // namespace Buff
diff --git a/common/patches/tob.cpp b/common/patches/tob.cpp
index fc49947e6..8c70437bb 100644
--- a/common/patches/tob.cpp
+++ b/common/patches/tob.cpp
@@ -5531,7 +5531,7 @@ uint32_t TOB::ResolveID(uint32_t id) const
 	case DISARMED_TRAP:
 		return TOBStringIDs::DisarmedTrap;
 	default:
-		return RoF2::ResolveID(id);
+		return Titanium::ResolveID(id);
 	}
 }
 
@@ -5545,7 +5545,7 @@ void TOB::ResolveArguments(uint32_t id, std::array<const char*, 9>& args) const
 		// take all arguments (spell link)
 		break;
 	default:
-		RoF2::ResolveArguments(id, args);
+		Titanium::ResolveArguments(id, args);
 		break;
 	}
 }
diff --git a/common/patches/tob.h b/common/patches/tob.h
index 19129815a..2410b585b 100644
--- a/common/patches/tob.h
+++ b/common/patches/tob.h
@@ -36,7 +36,7 @@ namespace TOB
 
 namespace Message {
 
-class TOB : public RoF2
+class TOB : public Titanium
 {
 public:
 	TOB() = default;
@@ -59,7 +59,7 @@ protected:
 
 namespace Buff {
 
-class TOB : public RoF2
+class TOB : public UF
 {
 public:
 	TOB() = default;
diff --git a/common/patches/uf.h b/common/patches/uf.h
index 9c0eb7a1c..8f9ede416 100644
--- a/common/patches/uf.h
+++ b/common/patches/uf.h
@@ -50,17 +50,6 @@ namespace UF
 
 }; /*UF*/
 
-namespace Message {
-
-class UF : public SoD
-{
-public:
-	UF() = default;
-	~UF() override = default;
-};
-
-} // namespace Message
-
 namespace Buff {
 
 class UF : public SoD