diff --git a/gerbview/class_DCodeSelectionbox.cpp b/gerbview/DCodeSelectionbox.cpp
similarity index 100%
rename from gerbview/class_DCodeSelectionbox.cpp
rename to gerbview/DCodeSelectionbox.cpp
diff --git a/gerbview/class_DCodeSelectionbox.h b/gerbview/DCodeSelectionbox.h
similarity index 100%
rename from gerbview/class_DCodeSelectionbox.h
rename to gerbview/DCodeSelectionbox.h
diff --git a/gerbview/class_X2_gerber_attributes.cpp b/gerbview/X2_gerber_attributes.cpp
similarity index 100%
rename from gerbview/class_X2_gerber_attributes.cpp
rename to gerbview/X2_gerber_attributes.cpp
diff --git a/gerbview/class_X2_gerber_attributes.h b/gerbview/X2_gerber_attributes.h
similarity index 100%
rename from gerbview/class_X2_gerber_attributes.h
rename to gerbview/X2_gerber_attributes.h
diff --git a/gerbview/class_am_param.cpp b/gerbview/am_param.cpp
similarity index 100%
rename from gerbview/class_am_param.cpp
rename to gerbview/am_param.cpp
diff --git a/gerbview/class_am_param.h b/gerbview/am_param.h
similarity index 100%
rename from gerbview/class_am_param.h
rename to gerbview/am_param.h
diff --git a/gerbview/class_aperture_macro.cpp b/gerbview/am_primitive.cpp
similarity index 100%
rename from gerbview/class_aperture_macro.cpp
rename to gerbview/am_primitive.cpp
diff --git a/gerbview/class_aperture_macro.h b/gerbview/am_primitive.h
similarity index 100%
rename from gerbview/class_aperture_macro.h
rename to gerbview/am_primitive.h
diff --git a/gerbview/class_excellon.h b/gerbview/excellon_image.h
similarity index 100%
rename from gerbview/class_excellon.h
rename to gerbview/excellon_image.h
diff --git a/gerbview/class_gbr_display_options.h b/gerbview/gbr_display_options.h
similarity index 100%
rename from gerbview/class_gbr_display_options.h
rename to gerbview/gbr_display_options.h
diff --git a/gerbview/class_gbr_layer_box_selector.cpp b/gerbview/gbr_layer_box_selector.cpp
similarity index 100%
rename from gerbview/class_gbr_layer_box_selector.cpp
rename to gerbview/gbr_layer_box_selector.cpp
diff --git a/gerbview/class_gbr_layer_box_selector.h b/gerbview/gbr_layer_box_selector.h
similarity index 100%
rename from gerbview/class_gbr_layer_box_selector.h
rename to gerbview/gbr_layer_box_selector.h
diff --git a/gerbview/class_gbr_layout.cpp b/gerbview/gbr_layout.cpp
similarity index 100%
rename from gerbview/class_gbr_layout.cpp
rename to gerbview/gbr_layout.cpp
diff --git a/gerbview/class_gbr_layout.h b/gerbview/gbr_layout.h
similarity index 100%
rename from gerbview/class_gbr_layout.h
rename to gerbview/gbr_layout.h
diff --git a/gerbview/class_gbr_screen.cpp b/gerbview/gbr_screen.cpp
similarity index 100%
rename from gerbview/class_gbr_screen.cpp
rename to gerbview/gbr_screen.cpp
diff --git a/gerbview/class_gbr_screen.h b/gerbview/gbr_screen.h
similarity index 100%
rename from gerbview/class_gbr_screen.h
rename to gerbview/gbr_screen.h
diff --git a/gerbview/class_gerber_draw_item.cpp b/gerbview/gerber_draw_item.cpp
similarity index 100%
rename from gerbview/class_gerber_draw_item.cpp
rename to gerbview/gerber_draw_item.cpp
diff --git a/gerbview/class_gerber_draw_item.h b/gerbview/gerber_draw_item.h
similarity index 100%
rename from gerbview/class_gerber_draw_item.h
rename to gerbview/gerber_draw_item.h
diff --git a/gerbview/class_gerber_file_image.cpp b/gerbview/gerber_file_image.cpp
similarity index 100%
rename from gerbview/class_gerber_file_image.cpp
rename to gerbview/gerber_file_image.cpp
diff --git a/gerbview/class_gerber_file_image.h b/gerbview/gerber_file_image.h
similarity index 100%
rename from gerbview/class_gerber_file_image.h
rename to gerbview/gerber_file_image.h
diff --git a/gerbview/class_gerber_file_image_list.cpp b/gerbview/gerber_file_image_list.cpp
similarity index 100%
rename from gerbview/class_gerber_file_image_list.cpp
rename to gerbview/gerber_file_image_list.cpp
diff --git a/gerbview/class_gerber_file_image_list.h b/gerbview/gerber_file_image_list.h
similarity index 100%
rename from gerbview/class_gerber_file_image_list.h
rename to gerbview/gerber_file_image_list.h
diff --git a/gerbview/class_gerbview_layer_widget.cpp b/gerbview/gerbview_layer_widget.cpp
similarity index 100%
rename from gerbview/class_gerbview_layer_widget.cpp
rename to gerbview/gerbview_layer_widget.cpp
diff --git a/gerbview/class_gerbview_layer_widget.h b/gerbview/gerbview_layer_widget.h
similarity index 100%
rename from gerbview/class_gerbview_layer_widget.h
rename to gerbview/gerbview_layer_widget.h