diff --git a/themes/question/image_select/survey/questions/answer/listradio/answer.twig b/themes/question/image_select-listradio/survey/questions/answer/listradio/answer.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/answer.twig
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/answer.twig
diff --git a/themes/question/image_select/survey/questions/answer/listradio/assets/css/imageselect.css b/themes/question/image_select-listradio/survey/questions/answer/listradio/assets/css/imageselect.css
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/assets/css/imageselect.css
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/assets/css/imageselect.css
diff --git a/themes/question/image_select/survey/questions/answer/listradio/assets/scripts/imageselect.js b/themes/question/image_select-listradio/survey/questions/answer/listradio/assets/scripts/imageselect.js
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/assets/scripts/imageselect.js
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/assets/scripts/imageselect.js
diff --git a/themes/question/image_select/survey/questions/answer/listradio/columns/column_footer.php b/themes/question/image_select-listradio/survey/questions/answer/listradio/columns/column_footer.php
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/columns/column_footer.php
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/columns/column_footer.php
diff --git a/themes/question/image_select/survey/questions/answer/listradio/columns/column_footer.twig b/themes/question/image_select-listradio/survey/questions/answer/listradio/columns/column_footer.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/columns/column_footer.twig
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/columns/column_footer.twig
diff --git a/themes/question/image_select/survey/questions/answer/listradio/columns/column_header.twig b/themes/question/image_select-listradio/survey/questions/answer/listradio/columns/column_header.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/columns/column_header.twig
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/columns/column_header.twig
diff --git a/themes/question/image_select/survey/questions/answer/listradio/config.xml b/themes/question/image_select-listradio/survey/questions/answer/listradio/config.xml
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/config.xml
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/config.xml
diff --git a/themes/question/image_select/survey/questions/answer/listradio/rows/answer_row.twig b/themes/question/image_select-listradio/survey/questions/answer/listradio/rows/answer_row.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/rows/answer_row.twig
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/rows/answer_row.twig
diff --git a/themes/question/image_select/survey/questions/answer/listradio/rows/answer_row_noanswer.twig b/themes/question/image_select-listradio/survey/questions/answer/listradio/rows/answer_row_noanswer.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/rows/answer_row_noanswer.twig
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/rows/answer_row_noanswer.twig
diff --git a/themes/question/image_select/survey/questions/answer/listradio/rows/answer_row_other.twig b/themes/question/image_select-listradio/survey/questions/answer/listradio/rows/answer_row_other.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/listradio/rows/answer_row_other.twig
rename to themes/question/image_select-listradio/survey/questions/answer/listradio/rows/answer_row_other.twig
diff --git a/themes/question/image_select/survey/questions/answer/multiplechoice/answer.twig b/themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/answer.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/multiplechoice/answer.twig
rename to themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/answer.twig
diff --git a/themes/question/image_select/survey/questions/answer/multiplechoice/assets/css/imageselect.css b/themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/assets/css/imageselect.css
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/multiplechoice/assets/css/imageselect.css
rename to themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/assets/css/imageselect.css
diff --git a/themes/question/image_select/survey/questions/answer/multiplechoice/assets/scripts/imageselect.js b/themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/assets/scripts/imageselect.js
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/multiplechoice/assets/scripts/imageselect.js
rename to themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/assets/scripts/imageselect.js
diff --git a/themes/question/image_select/survey/questions/answer/multiplechoice/columns/column_footer.twig b/themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/columns/column_footer.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/multiplechoice/columns/column_footer.twig
rename to themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/columns/column_footer.twig
diff --git a/themes/question/image_select/survey/questions/answer/multiplechoice/columns/column_header.twig b/themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/columns/column_header.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/multiplechoice/columns/column_header.twig
rename to themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/columns/column_header.twig
diff --git a/themes/question/image_select/survey/questions/answer/multiplechoice/config.xml b/themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/config.xml
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/multiplechoice/config.xml
rename to themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/config.xml
diff --git a/themes/question/image_select/survey/questions/answer/multiplechoice/rows/answer_row.twig b/themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/rows/answer_row.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/multiplechoice/rows/answer_row.twig
rename to themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/rows/answer_row.twig
diff --git a/themes/question/image_select/survey/questions/answer/multiplechoice/rows/answer_row_other.twig b/themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/rows/answer_row_other.twig
similarity index 100%
rename from themes/question/image_select/survey/questions/answer/multiplechoice/rows/answer_row_other.twig
rename to themes/question/image_select-multiplechoice/survey/questions/answer/multiplechoice/rows/answer_row_other.twig