diff --git a/src/engine/platform/fmshared_OPN.h b/src/engine/platform/fmshared_OPN.h
index ae40748b..7632e78f 100644
--- a/src/engine/platform/fmshared_OPN.h
+++ b/src/engine/platform/fmshared_OPN.h
@@ -86,7 +86,7 @@
     return 2; \
   }
 
-class DivPlatformOPNBase: public DivPlatformFMBase {
+class DivPlatformOPN: public DivPlatformFMBase {
   protected:
     const unsigned char ADDR_MULT_DT=0x30;
     const unsigned char ADDR_TL=0x40;
@@ -108,7 +108,7 @@ class DivPlatformOPNBase: public DivPlatformFMBase {
     const double fmDivBase;
     const unsigned char ayDiv;
 
-    DivPlatformOPNBase(double f=9440540.0, double d=72, unsigned char a=32):
+    DivPlatformOPN(double f=9440540.0, double d=72, unsigned char a=32):
       DivPlatformFMBase(),
       fmFreqBase(f),
       fmDivBase(d),
diff --git a/src/engine/platform/genesis.h b/src/engine/platform/genesis.h
index ace427f6..7d2004f3 100644
--- a/src/engine/platform/genesis.h
+++ b/src/engine/platform/genesis.h
@@ -29,7 +29,7 @@ class DivYM2612Interface: public ymfm::ymfm_interface {
 
 };
 
-class DivPlatformGenesis: public DivPlatformOPNBase {
+class DivPlatformGenesis: public DivPlatformOPN {
   protected:
     const unsigned short chanOffs[6]={
       0x00, 0x01, 0x02, 0x100, 0x101, 0x102
@@ -155,7 +155,7 @@ class DivPlatformGenesis: public DivPlatformOPNBase {
     int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
     void quit();
     DivPlatformGenesis():
-      DivPlatformOPNBase(9440540.0, 72, 32) {}
+      DivPlatformOPN(9440540.0, 72, 32) {}
     ~DivPlatformGenesis();
 };
 #endif
diff --git a/src/engine/platform/ym2203.h b/src/engine/platform/ym2203.h
index c650583d..6d7bc420 100644
--- a/src/engine/platform/ym2203.h
+++ b/src/engine/platform/ym2203.h
@@ -29,7 +29,7 @@ class DivYM2203Interface: public ymfm::ymfm_interface {
 
 };
 
-class DivPlatformYM2203: public DivPlatformOPNBase {
+class DivPlatformYM2203: public DivPlatformOPN {
   protected:
     const unsigned short chanOffs[3]={
       0x00, 0x01, 0x02
@@ -118,7 +118,7 @@ class DivPlatformYM2203: public DivPlatformOPNBase {
     int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
     void quit();
     DivPlatformYM2203():
-      DivPlatformOPNBase(4720270.0, 36, 16) {}
+      DivPlatformOPN(4720270.0, 36, 16) {}
     ~DivPlatformYM2203();
 };
 #endif
diff --git a/src/engine/platform/ym2608.h b/src/engine/platform/ym2608.h
index 21eb487f..c1f43f4d 100644
--- a/src/engine/platform/ym2608.h
+++ b/src/engine/platform/ym2608.h
@@ -34,7 +34,7 @@ class DivYM2608Interface: public ymfm::ymfm_interface {
     DivYM2608Interface(): adpcmBMem(NULL), sampleBank(0) {}
 };
 
-class DivPlatformYM2608: public DivPlatformOPNBase {
+class DivPlatformYM2608: public DivPlatformOPN {
   protected:
     const unsigned short chanOffs[6]={
       0x00, 0x01, 0x02, 0x100, 0x101, 0x102
@@ -137,7 +137,7 @@ class DivPlatformYM2608: public DivPlatformOPNBase {
     int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
     void quit();
     DivPlatformYM2608():
-      DivPlatformOPNBase(9440540.0, 72, 32) {}
+      DivPlatformOPN(9440540.0, 72, 32) {}
     ~DivPlatformYM2608();
 };
 #endif
diff --git a/src/engine/platform/ym2610.h b/src/engine/platform/ym2610.h
index 069707dd..dde7ed10 100644
--- a/src/engine/platform/ym2610.h
+++ b/src/engine/platform/ym2610.h
@@ -34,7 +34,7 @@ class DivYM2610Interface: public ymfm::ymfm_interface {
     DivYM2610Interface(): adpcmAMem(NULL), adpcmBMem(NULL), sampleBank(0) {}
 };
 
-class DivPlatformYM2610Base: public DivPlatformOPNBase {
+class DivPlatformYM2610Base: public DivPlatformOPN {
   protected:
     unsigned char* adpcmAMem;
     size_t adpcmAMemLen;
@@ -50,7 +50,7 @@ class DivPlatformYM2610Base: public DivPlatformOPNBase {
     int init(DivEngine* parent, int channels, int sugRate, unsigned int flags);
     void quit();
     DivPlatformYM2610Base():
-      DivPlatformOPNBase(9440540.0, 72, 32) {}
+      DivPlatformOPN(9440540.0, 72, 32) {}
 };
 
 class DivPlatformYM2610: public DivPlatformYM2610Base {