diff --git a/modules/editor/components/poll/icon.gif b/modules/editor/components/poll_maker/icon.gif
similarity index 100%
rename from modules/editor/components/poll/icon.gif
rename to modules/editor/components/poll_maker/icon.gif
diff --git a/modules/editor/components/poll/info.xml b/modules/editor/components/poll_maker/info.xml
similarity index 100%
rename from modules/editor/components/poll/info.xml
rename to modules/editor/components/poll_maker/info.xml
diff --git a/modules/editor/components/poll/lang/ko.lang.php b/modules/editor/components/poll_maker/lang/ko.lang.php
similarity index 100%
rename from modules/editor/components/poll/lang/ko.lang.php
rename to modules/editor/components/poll_maker/lang/ko.lang.php
diff --git a/modules/editor/components/poll/poll.class.php b/modules/editor/components/poll_maker/poll.class.php
similarity index 100%
rename from modules/editor/components/poll/poll.class.php
rename to modules/editor/components/poll_maker/poll.class.php
diff --git a/modules/editor/components/poll/tpl/filter/insert_poll.xml b/modules/editor/components/poll_maker/tpl/filter/insert_poll.xml
similarity index 100%
rename from modules/editor/components/poll/tpl/filter/insert_poll.xml
rename to modules/editor/components/poll_maker/tpl/filter/insert_poll.xml
diff --git a/modules/editor/components/poll/tpl/popup.css b/modules/editor/components/poll_maker/tpl/popup.css
similarity index 100%
rename from modules/editor/components/poll/tpl/popup.css
rename to modules/editor/components/poll_maker/tpl/popup.css
diff --git a/modules/editor/components/poll/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
similarity index 100%
rename from modules/editor/components/poll/tpl/popup.html
rename to modules/editor/components/poll_maker/tpl/popup.html
diff --git a/modules/editor/components/poll/tpl/popup.js b/modules/editor/components/poll_maker/tpl/popup.js
similarity index 100%
rename from modules/editor/components/poll/tpl/popup.js
rename to modules/editor/components/poll_maker/tpl/popup.js