diff --git a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/AstBuilder.java b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/AstBuilder.java
index 69d1a8505e6a9f318b2648e41e2bed4f18d19eed..93cc7b1da39463cb51e0ae4a33b53d9f00d305fd 100644
--- a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/AstBuilder.java
+++ b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/AstBuilder.java
@@ -44,7 +44,7 @@ public class AstBuilder implements IBuildPhase {
 		return successful;
 	}
 
-public void run(final EventBTextEditor editor, final Resource resource,
+	public void run(final EventBTextEditor editor, final Resource resource,
 			final IDocument document, final IProgressMonitor monitor) {
 		successful = false;
 		
@@ -95,7 +95,6 @@ public void run(final EventBTextEditor editor, final Resource resource,
 			FormulasResolver.resolveFormulas(resource, astRoot, document,
 					markFormulaErrors);
 			monitor.worked(1);
-
 			/*
 			 * Add text representation as annotation to resource's model
 			 */
diff --git a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulaTranslator.java b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulaTranslator.java
index 7a10bca20e893208b20a0e291299d4ec3d86167f..c23dd05407b47e1095cca3c7168e801456ce8e80 100644
--- a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulaTranslator.java
+++ b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulaTranslator.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.swt.widgets.Display;
-import org.eventb.emf.core.EventBCommentedExpressionElement;
+import org.eventb.emf.core.EventBNamedCommentedExpressionElement;
 import org.eventb.emf.core.EventBElement;
 import org.eventb.emf.core.EventBNamedCommentedComponentElement;
 import org.eventb.emf.core.EventBNamedCommentedPredicateElement;
@@ -73,7 +73,7 @@ public class FormulaTranslator {
 		}
 	}
 
-	public void replace(final EventBCommentedExpressionElement expression) {
+	public void replace(final EventBNamedCommentedExpressionElement expression) {
 		final String input = expression.getExpression();
 
 		if (input != null) {
diff --git a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulasResolver.java b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulasResolver.java
index 74fe88fb07eaf1513c2323066ee6e0dd5bad9b73..679be65cea525be34862d01bfebca18a688c2204 100644
--- a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulasResolver.java
+++ b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulasResolver.java
@@ -36,7 +36,6 @@ public class FormulasResolver {
 		String projectName = resource.getURI().segment(1);
 		final List<FormulaParseException> exceptions = FormulaResolver
 				.resolveAllFormulas(projectName, astRoot);
-
 		if (markErrors && exceptions.size() > 0) {
 			markerHelper.deleteMarkers(resource,
 					RodinMarkerUtil.RODIN_PROBLEM_MARKER, true,
diff --git a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/MachineTranslateSwitch.java b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/MachineTranslateSwitch.java
index b8d860b5efa1c78e9b513de279bb06c9e26aa7ce..bd51d9d1481b066b5d5a0e837506899a6d853d54 100644
--- a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/MachineTranslateSwitch.java
+++ b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/MachineTranslateSwitch.java
@@ -6,7 +6,7 @@
 
 package org.eventb.texteditor.ui.build.ast;
 
-import org.eventb.emf.core.EventBCommentedExpressionElement;
+import org.eventb.emf.core.EventBNamedCommentedExpressionElement;
 import org.eventb.emf.core.EventBNamedCommentedPredicateElement;
 import org.eventb.emf.core.machine.Action;
 import org.eventb.emf.core.machine.util.MachineSwitch;
@@ -26,7 +26,7 @@ public class MachineTranslateSwitch extends MachineSwitch<Boolean> {
 	}
 
 	@Override
-	public Boolean caseEventBCommentedExpressionElement(final EventBCommentedExpressionElement object) {
+	public Boolean caseEventBNamedCommentedExpressionElement(final EventBNamedCommentedExpressionElement object) {
 		translator.replace(object);
 		return true;
 	}