diff --git a/src/meshlabplugins/edit_sample/CMakeLists.txt b/src/meshlabplugins/edit_sample/CMakeLists.txt
index 53699b7fa..89e71fca1 100644
--- a/src/meshlabplugins/edit_sample/CMakeLists.txt
+++ b/src/meshlabplugins/edit_sample/CMakeLists.txt
@@ -3,26 +3,26 @@
 
 ### Generated file! Edit the templates in src/templates then re-run ./make-cmake.py
 
-set(SOURCES edit_sample_factory.cpp sampleedit.cpp)
+set(SOURCES edit_sample_factory.cpp edit_sample.cpp)
 
-set(HEADERS edit_sample_factory.h sampleedit.h)
+set(HEADERS edit_sample_factory.h edit_sample.h)
 
-set(RESOURCES sampleedit.qrc)
+set(RESOURCES edit_sample.qrc)
 
-add_library(sampleedit MODULE ${SOURCES} ${HEADERS} ${RESOURCES})
+add_library(edit_sample MODULE ${SOURCES} ${HEADERS} ${RESOURCES})
 
-target_include_directories(sampleedit PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(sampleedit PUBLIC common)
+target_include_directories(edit_sample PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(edit_sample PUBLIC common)
 
-target_link_libraries(sampleedit PRIVATE OpenGL::GLU)
+target_link_libraries(edit_sample PRIVATE OpenGL::GLU)
 
-set_property(TARGET sampleedit PROPERTY FOLDER Plugins)
+set_property(TARGET edit_sample PROPERTY FOLDER Plugins)
 
-set_property(TARGET sampleedit PROPERTY RUNTIME_OUTPUT_DIRECTORY
+set_property(TARGET edit_sample PROPERTY RUNTIME_OUTPUT_DIRECTORY
                                         ${MESHLAB_PLUGIN_OUTPUT_DIR})
 
-set_property(TARGET sampleedit PROPERTY LIBRARY_OUTPUT_DIRECTORY
+set_property(TARGET edit_sample PROPERTY LIBRARY_OUTPUT_DIRECTORY
                                         ${MESHLAB_PLUGIN_OUTPUT_DIR})
 
-install(TARGETS sampleedit DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} COMPONENT
+install(TARGETS edit_sample DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} COMPONENT
                 Plugins)
diff --git a/src/meshlabplugins/edit_sample/sampleedit.cpp b/src/meshlabplugins/edit_sample/edit_sample.cpp
similarity index 99%
rename from src/meshlabplugins/edit_sample/sampleedit.cpp
rename to src/meshlabplugins/edit_sample/edit_sample.cpp
index cd36cf2bf..ac0766083 100644
--- a/src/meshlabplugins/edit_sample/sampleedit.cpp
+++ b/src/meshlabplugins/edit_sample/edit_sample.cpp
@@ -28,7 +28,7 @@ $Log: meshedit.cpp,v $
 #include <math.h>
 #include <stdlib.h>
 #include <meshlab/glarea.h>
-#include "sampleedit.h"
+#include "edit_sample.h"
 #include <wrap/gl/pick.h>
 #include <wrap/qt/gl_label.h>
 #include <wrap/qt/device_to_logical.h>
diff --git a/src/meshlabplugins/edit_sample/sampleedit.h b/src/meshlabplugins/edit_sample/edit_sample.h
similarity index 100%
rename from src/meshlabplugins/edit_sample/sampleedit.h
rename to src/meshlabplugins/edit_sample/edit_sample.h
diff --git a/src/meshlabplugins/edit_sample/edit_sample.pro b/src/meshlabplugins/edit_sample/edit_sample.pro
index 0bdc374de..7ddd5e104 100644
--- a/src/meshlabplugins/edit_sample/edit_sample.pro
+++ b/src/meshlabplugins/edit_sample/edit_sample.pro
@@ -1,17 +1,16 @@
 include (../../shared.pri)
 
-
 HEADERS += \
-    edit_sample_factory.h \
-    sampleedit.h
+    edit_sample.h \
+    edit_sample_factory.h
 				 
 SOURCES += \
-    edit_sample_factory.cpp \
-    sampleedit.cpp
+    edit_sample.cpp \
+    edit_sample_factory.cpp
 
 RESOURCES += \
-    sampleedit.qrc
+    edit_sample.qrc
 
-TARGET = sampleedit
+TARGET = edit_sample
 
 
diff --git a/src/meshlabplugins/edit_sample/sampleedit.qrc b/src/meshlabplugins/edit_sample/edit_sample.qrc
similarity index 100%
rename from src/meshlabplugins/edit_sample/sampleedit.qrc
rename to src/meshlabplugins/edit_sample/edit_sample.qrc
diff --git a/src/meshlabplugins/edit_sample/edit_sample_factory.cpp b/src/meshlabplugins/edit_sample/edit_sample_factory.cpp
index 8ebcb1ccb..c108229a5 100644
--- a/src/meshlabplugins/edit_sample/edit_sample_factory.cpp
+++ b/src/meshlabplugins/edit_sample/edit_sample_factory.cpp
@@ -22,7 +22,7 @@
 ****************************************************************************/
 
 #include "edit_sample_factory.h"
-#include "sampleedit.h"
+#include "edit_sample.h"
 
 SampleEditFactory::SampleEditFactory()
 {
diff --git a/src/meshlabplugins/filter_sample/CMakeLists.txt b/src/meshlabplugins/filter_sample/CMakeLists.txt
index 1136ccb87..bd53bbb81 100644
--- a/src/meshlabplugins/filter_sample/CMakeLists.txt
+++ b/src/meshlabplugins/filter_sample/CMakeLists.txt
@@ -3,22 +3,22 @@
 
 ### Generated file! Edit the templates in src/templates then re-run ./make-cmake.py
 
-set(SOURCES samplefilter.cpp)
+set(SOURCES filter_sample.cpp)
 
-set(HEADERS samplefilter.h)
+set(HEADERS filter_sample.h)
 
-add_library(samplefilter MODULE ${SOURCES} ${HEADERS})
+add_library(filter_sample MODULE ${SOURCES} ${HEADERS})
 
-target_include_directories(samplefilter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(samplefilter PUBLIC common)
+target_include_directories(filter_sample PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(filter_sample PUBLIC common)
 
-set_property(TARGET samplefilter PROPERTY FOLDER Plugins)
+set_property(TARGET filter_sample PROPERTY FOLDER Plugins)
 
-set_property(TARGET samplefilter PROPERTY RUNTIME_OUTPUT_DIRECTORY
+set_property(TARGET filter_sample PROPERTY RUNTIME_OUTPUT_DIRECTORY
                                           ${MESHLAB_PLUGIN_OUTPUT_DIR})
 
-set_property(TARGET samplefilter PROPERTY LIBRARY_OUTPUT_DIRECTORY
+set_property(TARGET filter_sample PROPERTY LIBRARY_OUTPUT_DIRECTORY
                                           ${MESHLAB_PLUGIN_OUTPUT_DIR})
 
-install(TARGETS samplefilter DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR}
+install(TARGETS filter_sample DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR}
                 COMPONENT Plugins)
diff --git a/src/meshlabplugins/filter_sample/samplefilter.cpp b/src/meshlabplugins/filter_sample/filter_sample.cpp
similarity index 98%
rename from src/meshlabplugins/filter_sample/samplefilter.cpp
rename to src/meshlabplugins/filter_sample/filter_sample.cpp
index 3ff47168b..fc406097d 100644
--- a/src/meshlabplugins/filter_sample/samplefilter.cpp
+++ b/src/meshlabplugins/filter_sample/filter_sample.cpp
@@ -21,7 +21,7 @@
 *                                                                           *
 ****************************************************************************/
 
-#include "samplefilter.h"
+#include "filter_sample.h"
 #include <QtScript>
 
 // Constructor usually performs only two simple tasks of filling the two lists 
@@ -41,7 +41,7 @@ ExtraSamplePlugin::ExtraSamplePlugin()
 QString ExtraSamplePlugin::filterName(FilterIDType filterId) const
 {
   switch(filterId) {
-		case FP_MOVE_VERTEX :  return QString("Random vertex displacement"); 
+        case FP_MOVE_VERTEX :  return QString("Random Vertex Displacement");
 		default : assert(0); 
 	}
   return QString();
diff --git a/src/meshlabplugins/filter_sample/samplefilter.h b/src/meshlabplugins/filter_sample/filter_sample.h
similarity index 100%
rename from src/meshlabplugins/filter_sample/samplefilter.h
rename to src/meshlabplugins/filter_sample/filter_sample.h
diff --git a/src/meshlabplugins/filter_sample/filter_sample.pro b/src/meshlabplugins/filter_sample/filter_sample.pro
index 36f7e73a2..66ce6fbd2 100644
--- a/src/meshlabplugins/filter_sample/filter_sample.pro
+++ b/src/meshlabplugins/filter_sample/filter_sample.pro
@@ -1,9 +1,9 @@
 include (../../shared.pri)
 
 HEADERS += \
-    samplefilter.h
+    filter_sample.h
 
 SOURCES += \
-    samplefilter.cpp
+    filter_sample.cpp
 		
-TARGET = samplefilter
+TARGET = filter_sample