diff --git a/eclipse/com.gluonhq.eclipse.plugin/pom.xml b/eclipse/com.gluonhq.eclipse.plugin/pom.xml
index da1899d..a2ce621 100644
--- a/eclipse/com.gluonhq.eclipse.plugin/pom.xml
+++ b/eclipse/com.gluonhq.eclipse.plugin/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>com.gluonhq</groupId>
       <artifactId>ide-plugin-templates</artifactId>
-      <version>2.10.3</version>
+      <version>2.10.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/eclipse/com.gluonhq.eclipse.plugin/src/main/java/com/gluonhq/eclipse/plugin/wizard/GluonProjectApplicationOperation.java b/eclipse/com.gluonhq.eclipse.plugin/src/main/java/com/gluonhq/eclipse/plugin/wizard/GluonProjectApplicationOperation.java
index 34a1971..8416113 100644
--- a/eclipse/com.gluonhq.eclipse.plugin/src/main/java/com/gluonhq/eclipse/plugin/wizard/GluonProjectApplicationOperation.java
+++ b/eclipse/com.gluonhq.eclipse.plugin/src/main/java/com/gluonhq/eclipse/plugin/wizard/GluonProjectApplicationOperation.java
@@ -84,8 +84,8 @@ private void createProjectContents(IProgressMonitor mon, File projectDir) {
 			parameters.put(ProjectConstants.PARAM_GLUON_DESKTOP_VERSION, ProjectConstants.getDesktopVersion());
 			parameters.put(ProjectConstants.PARAM_GLUON_MOBILE_VERSION, ProjectConstants.getMobileVersion());
 			parameters.put(ProjectConstants.PARAM_GLUON_ATTACH_VERSION, ProjectConstants.getAttachVersion());
-			parameters.put(ProjectConstants.PARAM_GLUON_CLIENT_MAVEN_PLUGIN, ProjectConstants.getClientMavenPluginVersion());
-			parameters.put(ProjectConstants.PARAM_GLUON_CLIENT_GRADLE_PLUGIN, ProjectConstants.getClientGradlePluginVersion());
+			parameters.put(ProjectConstants.PARAM_GLUONFX_MAVEN_PLUGIN, ProjectConstants.getGluonFXMavenPluginVersion());
+			parameters.put(ProjectConstants.PARAM_GLUONFX_GRADLE_PLUGIN, ProjectConstants.getGluonFXGradlePluginVersion());
 			parameters.put(ProjectConstants.PARAM_GLUON_GLISTEN_AFTERBURNER_VERSION, ProjectConstants.getGlistenAfterburnerVersion());
 
 			List<File> filesToOpen = new ArrayList<>();
diff --git a/intellij/build.gradle b/intellij/build.gradle
index 1cc93b2..964e61e 100644
--- a/intellij/build.gradle
+++ b/intellij/build.gradle
@@ -12,14 +12,14 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
 repositories {
     mavenLocal()
-    jcenter()
+    mavenCentral()
     maven {
         url 'https://nexus.gluonhq.com/nexus/content/repositories/releases'
     }
 }
 
 dependencies {
-    compile 'com.gluonhq:ide-plugin-templates:2.10.3'
+    compile 'com.gluonhq:ide-plugin-templates:2.10.4-SNAPSHOT'
 }
 
 
diff --git a/intellij/src/main/java/com/gluonhq/plugin/intellij/module/GluonTemplateModuleBuilder.java b/intellij/src/main/java/com/gluonhq/plugin/intellij/module/GluonTemplateModuleBuilder.java
index b1bd6b2..e385efc 100644
--- a/intellij/src/main/java/com/gluonhq/plugin/intellij/module/GluonTemplateModuleBuilder.java
+++ b/intellij/src/main/java/com/gluonhq/plugin/intellij/module/GluonTemplateModuleBuilder.java
@@ -196,8 +196,8 @@ private void createProject(final Project project) {
         parameters.put(ProjectConstants.PARAM_GLUON_DESKTOP_VERSION, ProjectConstants.getDesktopVersion());
         parameters.put(ProjectConstants.PARAM_GLUON_MOBILE_VERSION, ProjectConstants.getMobileVersion());
         parameters.put(ProjectConstants.PARAM_GLUON_ATTACH_VERSION, ProjectConstants.getAttachVersion());
-        parameters.put(ProjectConstants.PARAM_GLUON_CLIENT_MAVEN_PLUGIN, ProjectConstants.getClientMavenPluginVersion());
-        parameters.put(ProjectConstants.PARAM_GLUON_CLIENT_GRADLE_PLUGIN, ProjectConstants.getClientGradlePluginVersion());
+        parameters.put(ProjectConstants.PARAM_GLUONFX_MAVEN_PLUGIN, ProjectConstants.getGluonFXMavenPluginVersion());
+        parameters.put(ProjectConstants.PARAM_GLUONFX_GRADLE_PLUGIN, ProjectConstants.getGluonFXGradlePluginVersion());
         parameters.put(ProjectConstants.PARAM_GLUON_GLISTEN_AFTERBURNER_VERSION, ProjectConstants.getGlistenAfterburnerVersion());
 
         final File projectRoot = new File(project.getBasePath());
diff --git a/netbeans/build.gradle b/netbeans/build.gradle
index 0e0f4c6..751a423 100644
--- a/netbeans/build.gradle
+++ b/netbeans/build.gradle
@@ -108,7 +108,7 @@ dependencies {
     providedCompile netbeansApi('org-openide-util-lookup')
     providedCompile files(findToolsJar(javaVersion))
 
-    compile 'com.gluonhq:ide-plugin-templates:2.10.3'
+    compile 'com.gluonhq:ide-plugin-templates:2.10.4-SNAPSHOT'
     compile 'org.apache.logging.log4j:log4j-1.2-api:2.5'
 }
 
diff --git a/netbeans/src/main/java/com/gluonhq/plugin/netbeans/template/iterators/GluonBaseWizardIterator.java b/netbeans/src/main/java/com/gluonhq/plugin/netbeans/template/iterators/GluonBaseWizardIterator.java
index bf67ee1..2d87223 100644
--- a/netbeans/src/main/java/com/gluonhq/plugin/netbeans/template/iterators/GluonBaseWizardIterator.java
+++ b/netbeans/src/main/java/com/gluonhq/plugin/netbeans/template/iterators/GluonBaseWizardIterator.java
@@ -119,8 +119,8 @@ public void initialize(WizardDescriptor wiz) {
         wiz.putProperty(ProjectConstants.PARAM_GLUON_DESKTOP_VERSION, ProjectConstants.getDesktopVersion());
         wiz.putProperty(ProjectConstants.PARAM_GLUON_MOBILE_VERSION, ProjectConstants.getMobileVersion());
         wiz.putProperty(ProjectConstants.PARAM_GLUON_ATTACH_VERSION, ProjectConstants.getAttachVersion());
-        wiz.putProperty(ProjectConstants.PARAM_GLUON_CLIENT_MAVEN_PLUGIN, ProjectConstants.getClientMavenPluginVersion());
-        wiz.putProperty(ProjectConstants.PARAM_GLUON_CLIENT_GRADLE_PLUGIN, ProjectConstants.getClientGradlePluginVersion());
+        wiz.putProperty(ProjectConstants.PARAM_GLUONFX_MAVEN_PLUGIN, ProjectConstants.getGluonFXMavenPluginVersion());
+        wiz.putProperty(ProjectConstants.PARAM_GLUONFX_GRADLE_PLUGIN, ProjectConstants.getGluonFXGradlePluginVersion());
         wiz.putProperty(ProjectConstants.PARAM_GLUON_GLISTEN_AFTERBURNER_VERSION, ProjectConstants.getGlistenAfterburnerVersion());
 
         handle.start();
diff --git a/netbeans/src/main/java/com/gluonhq/plugin/netbeans/template/iterators/GluonDesktopMultiWizardIterator.java b/netbeans/src/main/java/com/gluonhq/plugin/netbeans/template/iterators/GluonDesktopMultiWizardIterator.java
index 9dd61a6..3d02805 100644
--- a/netbeans/src/main/java/com/gluonhq/plugin/netbeans/template/iterators/GluonDesktopMultiWizardIterator.java
+++ b/netbeans/src/main/java/com/gluonhq/plugin/netbeans/template/iterators/GluonDesktopMultiWizardIterator.java
@@ -64,7 +64,7 @@ protected WizardDescriptor.Panel[] createPanels() {
 
     @Override
     protected String[] createSteps() {
-        if (!OptInHelper.alreadyOptedIn()) {	
+        if (!OptInHelper.alreadyOptedIn()) {
             return new String[]{
                 NbBundle.getMessage(GluonUserOptInPanel.class, "LBL_UserOptIn"),
                 NbBundle.getMessage(GluonUserOptInPanel.class, "LBL_CreateProjectStep"),