diff --git a/pdex/.externalToolBuilders/Ant_Builder.launch b/pdex/.externalToolBuilders/Ant_Builder.launch
new file mode 100644
index 000000000..c6037b992
--- /dev/null
+++ b/pdex/.externalToolBuilders/Ant_Builder.launch
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="install,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="install,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="install,"/>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="processing-experimental"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/processing-experimental/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/pdex/.project b/pdex/.project
index 1be6ebc0c..1dc755de3 100644
--- a/pdex/.project
+++ b/pdex/.project
@@ -10,6 +10,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/Ant_Builder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/pdex/src/processing/mode/experimental/ASTGenerator.java b/pdex/src/processing/mode/experimental/ASTGenerator.java
index 86a4fdc3b..68a37a5b4 100644
--- a/pdex/src/processing/mode/experimental/ASTGenerator.java
+++ b/pdex/src/processing/mode/experimental/ASTGenerator.java
@@ -134,6 +134,7 @@ public class ASTGenerator {
     renameWindow.setLayout(new GridLayout(3, 1));
     renameWindow.add(renameButton);
     renameWindow.add(listOccurrence);
+    renameWindow.setTitle("Rename..");
     renameTextField = new JTextField();
     renameTextField.setPreferredSize(new Dimension(150, 60));
     renameWindow.add(renameTextField);
@@ -1299,25 +1300,31 @@ public class ASTGenerator {
                 - editor.ta.getSelectedText().length();
             HashMap<Integer, Integer> lineOffsetDisplacement = new HashMap<Integer, Integer>();
 
+            // I need to store the pde and java offsets beforehand because once
+            // the replace starts, all offsets returned are affected
+            int offsetsMap[][][] = new int[defCU.getChildCount()][2][];
             for (int i = defCU.getChildCount() - 1; i >= 0; i--) {
               ASTNodeWrapper awrap = (ASTNodeWrapper) ((DefaultMutableTreeNode) (defCU
                   .getChildAt(i))).getUserObject();
-              int pdeoffsets[] = awrap.getPDECodeOffsets(errorCheckerService);
-              int javaoffsets[] = awrap.getJavaCodeOffsets(errorCheckerService);
-
+              offsetsMap[i][0] = awrap.getPDECodeOffsets(errorCheckerService);
+              offsetsMap[i][1] = awrap.getJavaCodeOffsets(errorCheckerService);
+            }
+            
+            for (int i = defCU.getChildCount() - 1; i >= 0; i--) {
+              int pdeoffsets[] = offsetsMap[i][0];
+              int javaoffsets[] = offsetsMap[i][1];
               // correction for pde enhancements related displacement on a line
               int off = 0;
-              if(lineOffsetDisplacement.get(javaoffsets[0]) != null){
+              if (lineOffsetDisplacement.get(javaoffsets[0]) != null) {
                 off = lineOffsetDisplacement.get(javaoffsets[0]);
-                
+
                 lineOffsetDisplacement.put(javaoffsets[0],
                                            lineOffsetDisplacementConst + off);
-              }
-              else{
+              } else {
                 lineOffsetDisplacement.put(javaoffsets[0],
-                                           lineOffsetDisplacementConst);                
+                                           lineOffsetDisplacementConst);
               }
-              
+
               ErrorCheckerService.scrollToErrorLine(editor, pdeoffsets[0],
                                                     pdeoffsets[1],
                                                     javaoffsets[1] + off,