diff --git a/org.eclipse.virgo.nano.core/template.mf b/org.eclipse.virgo.nano.core/template.mf
index b728e8b..12c0c14 100644
--- a/org.eclipse.virgo.nano.core/template.mf
+++ b/org.eclipse.virgo.nano.core/template.mf
@@ -4,11 +4,11 @@
 Bundle-SymbolicName: org.eclipse.virgo.nano.core
 Bundle-Version: ${version}
 Service-Component: OSGI-INF/org.eclipse.virgo.nano.config.xml,OSGI-INF/org.eclipse.virgo.nano.core.xml,OSGI-INF/org.eclipse.virgo.nano.server.readiness.tracker.xml
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
  org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  javax.management.*;version="0",
  javax.xml.parsers;version="0",
  org.osgi.*;version="0",
@@ -16,5 +16,5 @@
  org.eclipse.equinox.region.*;version="${equinoxRegionExportedPackageVersion:[=.=.=, =.+1)}",
  org.w3c.dom;version="0",
  org.xml.sax;version="0"
-Excluded-Exports: 
+Excluded-Exports:
  *.internal.*
diff --git a/org.eclipse.virgo.nano.services.concurrent/template.mf b/org.eclipse.virgo.nano.services.concurrent/template.mf
index 099b3f9..89b9203 100644
--- a/org.eclipse.virgo.nano.services.concurrent/template.mf
+++ b/org.eclipse.virgo.nano.services.concurrent/template.mf
@@ -4,12 +4,12 @@
 Bundle-SymbolicName: org.eclipse.virgo.nano.services.concurrent
 Bundle-Version: ${version}
 Service-Component: OSGI-INF/org.eclipse.virgo.nano.services.concurrent.xml
-Excluded-Exports: 
+Excluded-Exports:
  *.internal.*
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}";resolution:=optional,
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
  org.osgi.framework.*;version="0",
  org.osgi.service.component.*;version="0"