diff --git a/pcbnew/class_action_plugin.cpp b/pcbnew/action_plugin.cpp
similarity index 100%
rename from pcbnew/class_action_plugin.cpp
rename to pcbnew/action_plugin.cpp
diff --git a/pcbnew/class_action_plugin.h b/pcbnew/action_plugin.h
similarity index 100%
rename from pcbnew/class_action_plugin.h
rename to pcbnew/action_plugin.h
diff --git a/pcbnew/class_netclass.cpp b/pcbnew/netclass.cpp
similarity index 100%
rename from pcbnew/class_netclass.cpp
rename to pcbnew/netclass.cpp
diff --git a/pcbnew/class_netclass.h b/pcbnew/netclass.h
similarity index 100%
rename from pcbnew/class_netclass.h
rename to pcbnew/netclass.h
diff --git a/pcbnew/class_netinfo.h b/pcbnew/netinfo.h
similarity index 100%
rename from pcbnew/class_netinfo.h
rename to pcbnew/netinfo.h
diff --git a/pcbnew/class_netinfo_item.cpp b/pcbnew/netinfo_item.cpp
similarity index 100%
rename from pcbnew/class_netinfo_item.cpp
rename to pcbnew/netinfo_item.cpp
diff --git a/pcbnew/class_netinfolist.cpp b/pcbnew/netinfo_list.cpp
similarity index 100%
rename from pcbnew/class_netinfolist.cpp
rename to pcbnew/netinfo_list.cpp
diff --git a/pcbnew/classpcb.cpp b/pcbnew/pcb_screen.cpp
similarity index 100%
rename from pcbnew/classpcb.cpp
rename to pcbnew/pcb_screen.cpp
diff --git a/pcbnew/class_zone_settings.cpp b/pcbnew/zone_settings.cpp
similarity index 99%
rename from pcbnew/class_zone_settings.cpp
rename to pcbnew/zone_settings.cpp
index bc18e9186b..4735ada51f 100644
--- a/pcbnew/class_zone_settings.cpp
+++ b/pcbnew/zone_settings.cpp
@@ -89,9 +89,9 @@ ZONE_SETTINGS& ZONE_SETTINGS::operator << ( const ZONE_CONTAINER& aSource )
     m_keepoutDoNotAllowVias = aSource.GetDoNotAllowVias();
     m_keepoutDoNotAllowTracks = aSource.GetDoNotAllowTracks();
 
-    m_CurrentZone_Layer  = aSource.GetLayer();
-    m_Layers = aSource.GetLayerSet();
-
+    m_CurrentZone_Layer  = aSource.GetLayer();
+    m_Layers = aSource.GetLayerSet();
+
     return *this;
 }
 
@@ -116,16 +116,16 @@ void ZONE_SETTINGS::ExportSetting( ZONE_CONTAINER& aTarget, bool aFullExport ) c
     {
         aTarget.SetPriority( m_ZonePriority );
         aTarget.SetNetCode( m_NetcodeSelection );
-
-        // Keepout zones can have multiple layers
-        if( m_isKeepout )
-        {
-            aTarget.SetLayerSet( m_Layers );
-        }
-        else
-        {
-            aTarget.SetLayer( m_CurrentZone_Layer );
-        }
+
+        // Keepout zones can have multiple layers
+        if( m_isKeepout )
+        {
+            aTarget.SetLayerSet( m_Layers );
+        }
+        else
+        {
+            aTarget.SetLayer( m_CurrentZone_Layer );
+        }
     }
 
     // call SetHatch last, because hatch lines will be rebuilt,
diff --git a/pcbnew/class_zone_settings.h b/pcbnew/zone_settings.h
similarity index 99%
rename from pcbnew/class_zone_settings.h
rename to pcbnew/zone_settings.h
index 1850d14e54..4fbe98550e 100644
--- a/pcbnew/class_zone_settings.h
+++ b/pcbnew/zone_settings.h
@@ -64,8 +64,8 @@ public:
     int  m_ZoneMinThickness;            ///< Min thickness value in filled areas
     int  m_NetcodeSelection;            ///< Net code selection for the current zone
 
-    LSET m_Layers;
-
+    LSET m_Layers;
+
     PCB_LAYER_ID    m_CurrentZone_Layer;    ///< Layer used to create the current zone
 
     /// Option to show the zone area (outlines only, short hatches or full hatches