diff --git a/org.eclipse.virgo.apps.repository.core/template.mf b/org.eclipse.virgo.apps.repository.core/template.mf
index e6f7f6c..62e7d47 100644
--- a/org.eclipse.virgo.apps.repository.core/template.mf
+++ b/org.eclipse.virgo.apps.repository.core/template.mf
@@ -3,15 +3,15 @@
 Bundle-Name: Hosted Provisioning Repository
 Bundle-SymbolicName: org.eclipse.virgo.apps.repository.core
 Bundle-Version: ${version}
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, +1)}",
  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, +1)}",
  org.eclipse.virgo.repository.*;version="${version:[=.=.=, +1)}",
  org.eclipse.gemini.web.*;version="${geminiWebVersion:[=.=.=, +1)}",
  org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  org.osgi.framework.*;version="0",
  javax.management.*;version="0",
  org.slf4j.*;version="0"
-Excluded-Exports: 
+Excluded-Exports:
  org.eclipse.virgo.apps.repository.core.internal.*
diff --git a/org.eclipse.virgo.apps.repository.test/template.mf b/org.eclipse.virgo.apps.repository.test/template.mf
index f117037..a946fb9 100644
--- a/org.eclipse.virgo.apps.repository.test/template.mf
+++ b/org.eclipse.virgo.apps.repository.test/template.mf
@@ -3,19 +3,18 @@
 Bundle-Name: Hosted Provisioning Repository Test
 Bundle-SymbolicName: org.eclipse.virgo.apps.repository.test
 Bundle-Version: ${version}
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.kernel.*;version="${org.eclipse.virgo.kernel:[=.=.=, +1)}",
  org.eclipse.virgo.nano.*;version="${version:[=.=.=, +1)}",
  org.eclipse.virgo.repository.*;version="${version:[=.=.=, +1)}",
  org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, +1)}",
  org.eclipse.gemini.web.*;version="${org.eclipse.gemini.web:[=.=.=, +1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  org.junit.*;version="${org.junit:[=.=.=, +1)}",
  org.osgi.framework.*;version="0",
  javax.management.*;version="0",
  org.slf4j.*;version="0"
-Excluded-Imports: 
+Excluded-Imports:
  org.eclipse.virgo,
  org.eclipse.virgo.kernel.equinox.extensions.hooks
-