diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index a5352d0babb798aea326721bd562894c35881348..510be6ab216af4967990fec0e04d7ea2b8fe72b2 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -20,16 +20,16 @@ set(extension_SRC
 	implementation/xslt.cpp
 	implementation/script.cpp
 
-	param/bool.cpp
-	param/color.cpp
-	param/description.cpp
-	param/enum.cpp
-	param/float.cpp
-	param/int.cpp
-	param/notebook.cpp
+	param/param_bool.cpp
+	param/param_color.cpp
+	param/param_description.cpp
+	param/param_enum.cpp
+	param/param_float.cpp
+	param/param_int.cpp
+	param/param_notebook.cpp
 	param/parameter.cpp
-	param/radiobutton.cpp
-	param/string.cpp
+	param/param_radio_button.cpp
+	param/param_string.cpp
 
 	internal/bluredge.cpp
 	internal/cairo-png-out.cpp
@@ -76,16 +76,16 @@ set(extension_SRC
 	init.h
 	input.h
 	output.h
-	param/bool.h
-	param/color.h
-	param/description.h
-	param/enum.h
-	param/float.h
-	param/int.h
-	param/notebook.h
+	param/param_bool.h
+	param/param_color.h
+	param/param_description.h
+	param/param_enum.h
+	param/param_float.h
+	param/param_int.h
+	param/param_notebook.h
 	param/parameter.h
-	param/radiobutton.h
-	param/string.h
+	param/param_radio_button.h
+	param/param_string.h
 	patheffect.h
 	prefdialog.h
 	print.h
diff --git a/src/extension/param/bool.cpp b/src/extension/param/param_bool.cpp
similarity index 99%
rename from src/extension/param/bool.cpp
rename to src/extension/param/param_bool.cpp
index ac86e77b19a33346b764a74174c79f898db9f66e..835c9173494a2df00de3fab5cfefbf2ea20a8740 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/param_bool.cpp
@@ -17,7 +17,7 @@
 
 #include "xml/node.h"
 #include "../extension.h"
-#include "bool.h"
+#include "param_bool.h"
 #include "preferences.h"
 
 namespace Inkscape {
diff --git a/src/extension/param/bool.h b/src/extension/param/param_bool.h
similarity index 100%
rename from src/extension/param/bool.h
rename to src/extension/param/param_bool.h
diff --git a/src/extension/param/color.cpp b/src/extension/param/param_color.cpp
similarity index 99%
rename from src/extension/param/color.cpp
rename to src/extension/param/param_color.cpp
index 886f6ab492d7f7ba6a28b3d572af348910c0c835..1667cca10dbc1f953ee29a19d04387da98138c1d 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/param_color.cpp
@@ -21,7 +21,7 @@
 #include <xml/node.h>
 
 #include "../extension.h"
-#include "color.h"
+#include "param_color.h"
 
 #include <color.h>
 #include "ui/widget/color-notebook.h"
diff --git a/src/extension/param/color.h b/src/extension/param/param_color.h
similarity index 100%
rename from src/extension/param/color.h
rename to src/extension/param/param_color.h
diff --git a/src/extension/param/description.cpp b/src/extension/param/param_description.cpp
similarity index 99%
rename from src/extension/param/description.cpp
rename to src/extension/param/param_description.cpp
index d795514c39d1871c47b51be68a0df2d5e451bee6..ca7124f33f4dc0138ec827a6bb1eab7f5bf73be9 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/param_description.cpp
@@ -21,7 +21,7 @@
 
 #include "xml/node.h"
 #include "extension/extension.h"
-#include "description.h"
+#include "param_description.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/description.h b/src/extension/param/param_description.h
similarity index 100%
rename from src/extension/param/description.h
rename to src/extension/param/param_description.h
diff --git a/src/extension/param/enum.cpp b/src/extension/param/param_enum.cpp
similarity index 99%
rename from src/extension/param/enum.cpp
rename to src/extension/param/param_enum.cpp
index df4b22d0cbd0f18b25c86fc5d4fe80eb2cd34258..5dbaf5f339316c850f79151bb48dca24d785cb19 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/param_enum.cpp
@@ -25,7 +25,7 @@
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "document-private.h"
-#include "enum.h"
+#include "param_enum.h"
 #include "preferences.h"
 
 namespace Inkscape {
diff --git a/src/extension/param/enum.h b/src/extension/param/param_enum.h
similarity index 100%
rename from src/extension/param/enum.h
rename to src/extension/param/param_enum.h
diff --git a/src/extension/param/float.cpp b/src/extension/param/param_float.cpp
similarity index 99%
rename from src/extension/param/float.cpp
rename to src/extension/param/param_float.cpp
index bde96339a477de1cfe4c974555b2e9fe69176e8d..4ddb2d19e71f4837ba48b5ade703adc73b5344dd 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/param_float.cpp
@@ -19,7 +19,7 @@
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "preferences.h"
-#include "float.h"
+#include "param_float.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/float.h b/src/extension/param/param_float.h
similarity index 100%
rename from src/extension/param/float.h
rename to src/extension/param/param_float.h
diff --git a/src/extension/param/int.cpp b/src/extension/param/param_int.cpp
similarity index 99%
rename from src/extension/param/int.cpp
rename to src/extension/param/param_int.cpp
index 2e079208109386d10a0edbff0efc63b5595a18b3..3b3a808e5bb78c9f70f9d43e8f3c034614623b77 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/param_int.cpp
@@ -19,7 +19,7 @@
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "preferences.h"
-#include "int.h"
+#include "param_int.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/int.h b/src/extension/param/param_int.h
similarity index 100%
rename from src/extension/param/int.h
rename to src/extension/param/param_int.h
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/param_notebook.cpp
similarity index 99%
rename from src/extension/param/notebook.cpp
rename to src/extension/param/param_notebook.cpp
index f948cc937f448c41be800b43034fe8a6093b465c..faf804eb193cb5216ced266161e606819857ec04 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/param_notebook.cpp
@@ -28,8 +28,7 @@
 #include <extension/extension.h>
 #include "preferences.h"
 #include "document-private.h"
-
-#include "notebook.h"
+#include "param_notebook.h"
 
 /**
  * The root directory in the preferences database for extension
diff --git a/src/extension/param/notebook.h b/src/extension/param/param_notebook.h
similarity index 100%
rename from src/extension/param/notebook.h
rename to src/extension/param/param_notebook.h
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/param_radio_button.cpp
similarity index 99%
rename from src/extension/param/radiobutton.cpp
rename to src/extension/param/param_radio_button.cpp
index 428767cb0ed00c58f817a9c0a77171f8b2a7c39a..272ea009131fdce7039552037261e92313e9400a 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/param_radio_button.cpp
@@ -28,7 +28,7 @@
 #include "preferences.h"
 #include "document-private.h"
 
-#include "radiobutton.h"
+#include "param_radio_button.h"
 
 /**
  * The root directory in the preferences database for extension
diff --git a/src/extension/param/radiobutton.h b/src/extension/param/param_radio_button.h
similarity index 100%
rename from src/extension/param/radiobutton.h
rename to src/extension/param/param_radio_button.h
diff --git a/src/extension/param/string.cpp b/src/extension/param/param_string.cpp
similarity index 99%
rename from src/extension/param/string.cpp
rename to src/extension/param/param_string.cpp
index 59e21d77d7532618aaaa4708412c3b2cf152f225..e97eb5d650ca394407b9c0d8252deb0abcb3387e 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/param_string.cpp
@@ -18,7 +18,7 @@
 
 #include "xml/node.h"
 #include "extension/extension.h"
-#include "string.h"
+#include "param_string.h"
 #include "preferences.h"
 #include <glibmm/i18n.h>
 
diff --git a/src/extension/param/string.h b/src/extension/param/param_string.h
similarity index 100%
rename from src/extension/param/string.h
rename to src/extension/param/param_string.h
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 36c6838cd0659c024437e585060d595e0467b830..0b1dbbeb559b4ba61c0ae2b5cb5140f6d670f86b 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -30,15 +30,15 @@
 #include <color.h>
 
 #include "parameter.h"
-#include "bool.h"
-#include "color.h"
-#include "description.h"
-#include "enum.h"
-#include "float.h"
-#include "int.h"
-#include "notebook.h"
-#include "radiobutton.h"
-#include "string.h"
+#include "param_bool.h"
+#include "param_color.h"
+#include "param_description.h"
+#include "param_enum.h"
+#include "param_float.h"
+#include "param_int.h"
+#include "param_notebook.h"
+#include "param_radio_button.h"
+#include "param_string.h"
 
 #include <glibmm/i18n.h>