diff --git a/cvpcb/autosel.cpp b/cvpcb/auto_associate.cpp
similarity index 100%
rename from cvpcb/autosel.cpp
rename to cvpcb/auto_associate.cpp
diff --git a/cvpcb/autosel.h b/cvpcb/auto_associate.h
similarity index 100%
rename from cvpcb/autosel.h
rename to cvpcb/auto_associate.h
diff --git a/cvpcb/class_components_listbox.cpp b/cvpcb/components_listbox.cpp
similarity index 100%
rename from cvpcb/class_components_listbox.cpp
rename to cvpcb/components_listbox.cpp
diff --git a/cvpcb/class_DisplayFootprintsFrame.cpp b/cvpcb/display_footprints_frame.cpp
similarity index 100%
rename from cvpcb/class_DisplayFootprintsFrame.cpp
rename to cvpcb/display_footprints_frame.cpp
diff --git a/cvpcb/class_DisplayFootprintsFrame.h b/cvpcb/display_footprints_frame.h
similarity index 100%
rename from cvpcb/class_DisplayFootprintsFrame.h
rename to cvpcb/display_footprints_frame.h
diff --git a/cvpcb/class_footprints_listbox.cpp b/cvpcb/footprints_listbox.cpp
similarity index 100%
rename from cvpcb/class_footprints_listbox.cpp
rename to cvpcb/footprints_listbox.cpp
diff --git a/cvpcb/class_library_listbox.cpp b/cvpcb/library_listbox.cpp
similarity index 100%
rename from cvpcb/class_library_listbox.cpp
rename to cvpcb/library_listbox.cpp
diff --git a/cvpcb/listboxes.cpp b/cvpcb/listbox_base.cpp
similarity index 100%
rename from cvpcb/listboxes.cpp
rename to cvpcb/listbox_base.cpp
diff --git a/cvpcb/listview_classes.h b/cvpcb/listboxes.h
similarity index 100%
rename from cvpcb/listview_classes.h
rename to cvpcb/listboxes.h