diff --git a/resources/magento2/common.properties b/resources/magento2/common.properties
index a295a06f1..21ab21a87 100644
--- a/resources/magento2/common.properties
+++ b/resources/magento2/common.properties
@@ -5,7 +5,7 @@ common.module.version=Version
 common.module.license=License(s)
 common.dependencies=Dependencies
 common.httpMethod=HTTP Method
-common.controller.name=Controller Name
+common.controller.name=Action Path
 common.controller.inheritAction=Inherit Action Class
 common.controller.backend.acl=Admin Resource ACL
 common.controller.action=Action Name
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.form b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.form
index 5abf1a5be..25283ea73 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.form
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.form
@@ -75,7 +75,11 @@
             </constraints>
             <properties>
               <text value=""/>
+              <toolTipText value="Can consist of few directories, for an ex.: Product/Custom"/>
             </properties>
+            <clientProperties>
+              <promptText class="java.lang.String" value="Folder name for Action"/>
+            </clientProperties>
           </component>
           <component id="d25a" class="javax.swing.JLabel">
             <constraints>
@@ -109,7 +113,12 @@
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
-            <properties/>
+            <properties>
+              <text value=""/>
+            </properties>
+            <clientProperties>
+              <promptText class="java.lang.String" value="Class name for Action"/>
+            </clientProperties>
           </component>
           <component id="77374" class="javax.swing.JLabel" binding="actionNameErrorMessage">
             <constraints>