diff --git a/src/sound/oplsynth/OPL3.cpp b/src/sound/oplsynth/OPL3.cpp
index a6db55a0f..fee608088 100644
--- a/src/sound/oplsynth/OPL3.cpp
+++ b/src/sound/oplsynth/OPL3.cpp
@@ -55,6 +55,9 @@ static FRandom pr_opl3;
 
 #define VOLUME_MUL		0.3333
 
+namespace JavaOPL3
+{
+
 class Operator;
 
 static inline double StripIntPart(double num)
@@ -1862,7 +1865,9 @@ void OPL3::SetPanning(int c, float left, float right)
 	}
 }
 
+} // JavaOPL3
+
 OPLEmul *JavaOPLCreate(bool stereo)
 {
-	return new OPL3(stereo);
+	return new JavaOPL3::OPL3(stereo);
 }
diff --git a/src/sound/oplsynth/nukedopl3.cpp b/src/sound/oplsynth/nukedopl3.cpp
index 990418cd8..4bc3aa4ed 100644
--- a/src/sound/oplsynth/nukedopl3.cpp
+++ b/src/sound/oplsynth/nukedopl3.cpp
@@ -62,7 +62,7 @@
 // Envelope generator
 //
 
-namespace OPL3
+namespace NukedOPL3
 {
 
 typedef Bit16s(*envelope_sinfunc)(Bit16u phase, Bit16u envelope);
@@ -1020,8 +1020,8 @@ NukedOPL3::NukedOPL3(bool stereo) {
 	Reset();
 }
 
-} // namespace OPL3
+} // namespace NukedOPL3
 
 OPLEmul *NukedOPL3Create(bool stereo) {
-	return new OPL3::NukedOPL3(stereo);
+	return new NukedOPL3::NukedOPL3(stereo);
 }
diff --git a/src/sound/oplsynth/nukedopl3.h b/src/sound/oplsynth/nukedopl3.h
index 76f34dcda..423fbf668 100644
--- a/src/sound/oplsynth/nukedopl3.h
+++ b/src/sound/oplsynth/nukedopl3.h
@@ -32,7 +32,7 @@
 #include "opl.h"
 #include "musicblock.h"
 
-namespace OPL3
+namespace NukedOPL3
 {
 
 typedef uintptr_t	Bitu;
@@ -237,4 +237,4 @@ public:
 	NukedOPL3(bool stereo);
 };
 
-} // namespace OPL3
+} // namespace NukedOPL3