diff --git a/code/studio/src/plugins/bnp_manager/CMakeLists.txt b/code/studio/src/plugins/bnp_manager/CMakeLists.txt
index be56bc704..406a927b8 100644
--- a/code/studio/src/plugins/bnp_manager/CMakeLists.txt
+++ b/code/studio/src/plugins/bnp_manager/CMakeLists.txt
@@ -45,5 +45,5 @@ NL_ADD_LIB_SUFFIX(studio_plugin_bnp_manager)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 INSTALL(TARGETS studio_plugin_bnp_manager LIBRARY DESTINATION ${OVQT_PLUGIN_DIR} RUNTIME DESTINATION ${NL_BIN_PREFIX} ARCHIVE DESTINATION ${OVQT_PLUGIN_DIR} COMPONENT tools3d)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_bnp_manager.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_bnp_manager.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml b/code/studio/src/plugins/bnp_manager/studio_plugin_bnp_manager.xml
similarity index 100%
rename from code/studio/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml
rename to code/studio/src/plugins/bnp_manager/studio_plugin_bnp_manager.xml
diff --git a/code/studio/src/plugins/core/CMakeLists.txt b/code/studio/src/plugins/core/CMakeLists.txt
index add4665bc..964f95b11 100644
--- a/code/studio/src/plugins/core/CMakeLists.txt
+++ b/code/studio/src/plugins/core/CMakeLists.txt
@@ -69,5 +69,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_core.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_core.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/core/ovqt_plugin_core.xml b/code/studio/src/plugins/core/studio_plugin_core.xml
similarity index 100%
rename from code/studio/src/plugins/core/ovqt_plugin_core.xml
rename to code/studio/src/plugins/core/studio_plugin_core.xml
diff --git a/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt b/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt
index 65f880f07..bce24b667 100644
--- a/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt
+++ b/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt
@@ -55,5 +55,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_disp_sheet_id.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_disp_sheet_id.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/disp_sheet_id/ovqt_plugin_disp_sheet_id.xml b/code/studio/src/plugins/disp_sheet_id/studio_plugin_disp_sheet_id.xml
similarity index 100%
rename from code/studio/src/plugins/disp_sheet_id/ovqt_plugin_disp_sheet_id.xml
rename to code/studio/src/plugins/disp_sheet_id/studio_plugin_disp_sheet_id.xml
diff --git a/code/studio/src/plugins/example/CMakeLists.txt b/code/studio/src/plugins/example/CMakeLists.txt
index 9eda8916e..fd4008fc4 100644
--- a/code/studio/src/plugins/example/CMakeLists.txt
+++ b/code/studio/src/plugins/example/CMakeLists.txt
@@ -52,5 +52,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_example.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_example.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/example/ovqt_plugin_example.xml b/code/studio/src/plugins/example/studio_plugin_example.xml
similarity index 100%
rename from code/studio/src/plugins/example/ovqt_plugin_example.xml
rename to code/studio/src/plugins/example/studio_plugin_example.xml
diff --git a/code/studio/src/plugins/georges_editor/CMakeLists.txt b/code/studio/src/plugins/georges_editor/CMakeLists.txt
index 044d1ed39..bab12b7e1 100644
--- a/code/studio/src/plugins/georges_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/georges_editor/CMakeLists.txt
@@ -65,5 +65,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_georges_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_georges_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/georges_editor/ovqt_plugin_georges_editor.xml b/code/studio/src/plugins/georges_editor/studio_plugin_georges_editor.xml
similarity index 100%
rename from code/studio/src/plugins/georges_editor/ovqt_plugin_georges_editor.xml
rename to code/studio/src/plugins/georges_editor/studio_plugin_georges_editor.xml
diff --git a/code/studio/src/plugins/gui_editor/CMakeLists.txt b/code/studio/src/plugins/gui_editor/CMakeLists.txt
index 909d2e993..ff248a261 100644
--- a/code/studio/src/plugins/gui_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/gui_editor/CMakeLists.txt
@@ -100,4 +100,4 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_gui_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_gui_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
diff --git a/code/studio/src/plugins/gui_editor/ovqt_plugin_gui_editor.xml b/code/studio/src/plugins/gui_editor/studio_plugin_gui_editor.xml
similarity index 100%
rename from code/studio/src/plugins/gui_editor/ovqt_plugin_gui_editor.xml
rename to code/studio/src/plugins/gui_editor/studio_plugin_gui_editor.xml
diff --git a/code/studio/src/plugins/landscape_editor/CMakeLists.txt b/code/studio/src/plugins/landscape_editor/CMakeLists.txt
index 9fc9e2a5a..448d86a48 100644
--- a/code/studio/src/plugins/landscape_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/landscape_editor/CMakeLists.txt
@@ -71,4 +71,4 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_landscape_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_landscape_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
diff --git a/code/studio/src/plugins/landscape_editor/ovqt_plugin_landscape_editor.xml b/code/studio/src/plugins/landscape_editor/studio_plugin_landscape_editor.xml
similarity index 100%
rename from code/studio/src/plugins/landscape_editor/ovqt_plugin_landscape_editor.xml
rename to code/studio/src/plugins/landscape_editor/studio_plugin_landscape_editor.xml
diff --git a/code/studio/src/plugins/log/CMakeLists.txt b/code/studio/src/plugins/log/CMakeLists.txt
index 4ff8b1888..7a27f370a 100644
--- a/code/studio/src/plugins/log/CMakeLists.txt
+++ b/code/studio/src/plugins/log/CMakeLists.txt
@@ -51,5 +51,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_log.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_log.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/log/ovqt_plugin_log.xml b/code/studio/src/plugins/log/studio_plugin_log.xml
similarity index 100%
rename from code/studio/src/plugins/log/ovqt_plugin_log.xml
rename to code/studio/src/plugins/log/studio_plugin_log.xml
diff --git a/code/studio/src/plugins/mission_compiler/CMakeLists.txt b/code/studio/src/plugins/mission_compiler/CMakeLists.txt
index d2c1a4180..cbf35b9c7 100644
--- a/code/studio/src/plugins/mission_compiler/CMakeLists.txt
+++ b/code/studio/src/plugins/mission_compiler/CMakeLists.txt
@@ -62,5 +62,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_mission_compiler.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_mission_compiler.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/mission_compiler/ovqt_plugin_mission_compiler.xml b/code/studio/src/plugins/mission_compiler/studio_plugin_mission_compiler.xml
similarity index 100%
rename from code/studio/src/plugins/mission_compiler/ovqt_plugin_mission_compiler.xml
rename to code/studio/src/plugins/mission_compiler/studio_plugin_mission_compiler.xml
diff --git a/code/studio/src/plugins/object_viewer/CMakeLists.txt b/code/studio/src/plugins/object_viewer/CMakeLists.txt
index 79e535420..3a4ce9c65 100644
--- a/code/studio/src/plugins/object_viewer/CMakeLists.txt
+++ b/code/studio/src/plugins/object_viewer/CMakeLists.txt
@@ -212,5 +212,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_object_viewer.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_object_viewer.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/object_viewer/ovqt_plugin_object_viewer.xml b/code/studio/src/plugins/object_viewer/studio_plugin_object_viewer.xml
similarity index 100%
rename from code/studio/src/plugins/object_viewer/ovqt_plugin_object_viewer.xml
rename to code/studio/src/plugins/object_viewer/studio_plugin_object_viewer.xml
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt b/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
index 90764e7dd..a543421c5 100644
--- a/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
+++ b/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
@@ -44,5 +44,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_sheet_builder.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_sheet_builder.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/ovqt_plugin_sheet_builder.xml b/code/studio/src/plugins/ovqt_sheet_builder/studio_plugin_sheet_builder.xml
similarity index 100%
rename from code/studio/src/plugins/ovqt_sheet_builder/ovqt_plugin_sheet_builder.xml
rename to code/studio/src/plugins/ovqt_sheet_builder/studio_plugin_sheet_builder.xml
diff --git a/code/studio/src/plugins/tile_editor/CMakeLists.txt b/code/studio/src/plugins/tile_editor/CMakeLists.txt
index 889e40ffa..d546beba1 100644
--- a/code/studio/src/plugins/tile_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/tile_editor/CMakeLists.txt
@@ -44,4 +44,5 @@ NL_ADD_LIB_SUFFIX(studio_plugin_tile_editor)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
-INSTALL(TARGETS studio_plugin_tile_editor LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d)
\ No newline at end of file
+INSTALL(TARGETS studio_plugin_tile_editor LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_tile_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
diff --git a/code/studio/src/plugins/tile_editor/ovqt_plugin_tile_editor.xml b/code/studio/src/plugins/tile_editor/studio_plugin_tile_editor.xml
similarity index 100%
rename from code/studio/src/plugins/tile_editor/ovqt_plugin_tile_editor.xml
rename to code/studio/src/plugins/tile_editor/studio_plugin_tile_editor.xml
diff --git a/code/studio/src/plugins/translation_manager/CMakeLists.txt b/code/studio/src/plugins/translation_manager/CMakeLists.txt
index 64d081484..6f0f7a1c2 100644
--- a/code/studio/src/plugins/translation_manager/CMakeLists.txt
+++ b/code/studio/src/plugins/translation_manager/CMakeLists.txt
@@ -62,5 +62,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_translation_manager.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_translation_manager.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/translation_manager/ovqt_plugin_translation_manager.xml b/code/studio/src/plugins/translation_manager/studio_plugin_translation_manager.xml
similarity index 100%
rename from code/studio/src/plugins/translation_manager/ovqt_plugin_translation_manager.xml
rename to code/studio/src/plugins/translation_manager/studio_plugin_translation_manager.xml
diff --git a/code/studio/src/plugins/world_editor/CMakeLists.txt b/code/studio/src/plugins/world_editor/CMakeLists.txt
index 5f2d421f0..7b76ed810 100644
--- a/code/studio/src/plugins/world_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/world_editor/CMakeLists.txt
@@ -79,5 +79,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_world_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_world_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/world_editor/ovqt_plugin_world_editor.xml b/code/studio/src/plugins/world_editor/studio_plugin_world_editor.xml
similarity index 100%
rename from code/studio/src/plugins/world_editor/ovqt_plugin_world_editor.xml
rename to code/studio/src/plugins/world_editor/studio_plugin_world_editor.xml
diff --git a/code/studio/src/plugins/zone_painter/CMakeLists.txt b/code/studio/src/plugins/zone_painter/CMakeLists.txt
index 70c72f94c..94f5e85f7 100644
--- a/code/studio/src/plugins/zone_painter/CMakeLists.txt
+++ b/code/studio/src/plugins/zone_painter/CMakeLists.txt
@@ -57,5 +57,5 @@ ELSE(WIN32)
   ENDIF(WITH_INSTALL_LIBRARIES)
 ENDIF(WIN32)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_zone_painter.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_zone_painter.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
 
diff --git a/code/studio/src/plugins/zone_painter/ovqt_plugin_zone_painter.xml b/code/studio/src/plugins/zone_painter/studio_plugin_zone_painter.xml
similarity index 100%
rename from code/studio/src/plugins/zone_painter/ovqt_plugin_zone_painter.xml
rename to code/studio/src/plugins/zone_painter/studio_plugin_zone_painter.xml