diff --git a/common/class_marker_base.cpp b/common/marker_base.cpp
similarity index 100%
rename from common/class_marker_base.cpp
rename to common/marker_base.cpp
diff --git a/common/class_page_info.cpp b/common/page_info.cpp
similarity index 100%
rename from common/class_page_info.cpp
rename to common/page_info.cpp
diff --git a/include/class_base_screen.h b/include/base_screen.h
similarity index 100%
rename from include/class_base_screen.h
rename to include/base_screen.h
diff --git a/include/class_eda_rect.h b/include/eda_rect.h
similarity index 100%
rename from include/class_eda_rect.h
rename to include/eda_rect.h
diff --git a/include/class_page_info.h b/include/page_info.h
similarity index 100%
rename from include/class_page_info.h
rename to include/page_info.h
diff --git a/include/class_pcb_screen.h b/include/pcb_screen.h
similarity index 100%
rename from include/class_pcb_screen.h
rename to include/pcb_screen.h
diff --git a/include/class_title_block.h b/include/title_block.h
similarity index 100%
rename from include/class_title_block.h
rename to include/title_block.h