diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
index 0e11613052e..650c68e7962 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@ Eclipse-LazyStart: true
 Export-Package: 
  org.eclipse.rse.connectorservice.dstore,
  org.eclipse.rse.connectorservice.dstore.util,
- org.eclipse.rse.internal.connectorservice.dstore;x-internal:=true
+ org.eclipse.rse.internal.connectorservice.dstore;x-internal:=true,
+ org.eclipse.rse.internal.connectorservice.dstore.ui.propertypages;x-internal:=true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
index 5232ac2c44c..3e50714535d 100644
--- a/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
@@ -15,8 +15,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui.ide,
  org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.rse.internal.efs.ui;x-internal:=true
diff --git a/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF
index 40075f9bcaa..6681c8b2baf 100644
--- a/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF
@@ -20,18 +20,18 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.useractions.ui.compile,
- org.eclipse.rse.useractions.ui.uda,
+Export-Package: org.eclipse.rse.internal.useractions;x-internal:=true,
+ org.eclipse.rse.internal.useractions.files.compile;x-internal:=true,
+ org.eclipse.rse.internal.useractions.files.uda;x-internal:=true,
+ org.eclipse.rse.internal.useractions.ui;x-internal:=true,
+ org.eclipse.rse.internal.useractions.ui.compile;x-internal:=true,
+ org.eclipse.rse.internal.useractions.ui.uda;x-internal:=true,
+ org.eclipse.rse.internal.useractions.ui.uda.actions;x-internal:=true,
+ org.eclipse.rse.internal.useractions.ui.uda.util;x-internal:=true,
+ org.eclipse.rse.internal.useractions.ui.validators;x-internal:=true,
  org.eclipse.rse.useractions.files.compile,
  org.eclipse.rse.useractions.files.uda,
- org.eclipse.rse.internal.useractions.ui.compile,
- org.eclipse.rse.internal.useractions,
- org.eclipse.rse.internal.useractions.files.compile,
- org.eclipse.rse.internal.useractions.files.uda,
- org.eclipse.rse.internal.useractions.ui,
- org.eclipse.rse.internal.useractions.ui.compile,
- org.eclipse.rse.internal.useractions.ui.uda,
- org.eclipse.rse.internal.useractions.ui.uda.actions,
- org.eclipse.rse.internal.useractions.ui.uda.util
+ org.eclipse.rse.useractions.ui.compile,
+ org.eclipse.rse.useractions.ui.uda
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
index 890795b7feb..df60dc763cc 100644
--- a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
+++ b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
@@ -29,13 +29,18 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.rse.tests,
  org.eclipse.rse.tests.core,
  org.eclipse.rse.tests.core.connection,
+ org.eclipse.rse.tests.core.passwords,
  org.eclipse.rse.tests.core.registries,
+ org.eclipse.rse.tests.initialization,
  org.eclipse.rse.tests.internal;x-internal:=true,
  org.eclipse.rse.tests.internal.testsubsystem;x-internal:=true,
  org.eclipse.rse.tests.persistence,
  org.eclipse.rse.tests.preferences,
+ org.eclipse.rse.tests.profiles,
  org.eclipse.rse.tests.subsystems.files,
  org.eclipse.rse.tests.subsystems.testsubsystem,
  org.eclipse.rse.tests.testsubsystem,
- org.eclipse.rse.tests.testsubsystem.interfaces
+ org.eclipse.rse.tests.testsubsystem.interfaces,
+ org.eclipse.rse.tests.ui.mnemonics,
+ org.eclipse.rse.tests.ui.preferences
 Bundle-ClassPath: rsetests.jar
diff --git a/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
index aaa76488f5c..86c3cc0812e 100644
--- a/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
@@ -11,10 +11,12 @@ Require-Bundle: org.junit,
  org.eclipse.jface,
  org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Export-Package: org.eclipse.tm.internal.terminal.emulator;x-internal:=true,
+Export-Package: org.eclipse.tm.internal.terminal.connector;x-internal:=true,
+ org.eclipse.tm.internal.terminal.emulator;x-internal:=true,
  org.eclipse.tm.internal.terminal.model;x-internal:=true,
  org.eclipse.tm.internal.terminal.speedtest;x-internal:=true,
  org.eclipse.tm.internal.terminal.test.terminalcanvas;x-internal:=true,
  org.eclipse.tm.internal.terminal.test.ui;x-internal:=true,
  org.eclipse.tm.internal.terminal.textcanvas;x-internal:=true,
- org.eclipse.tm.terminal.model
+ org.eclipse.tm.terminal.model,
+ org.eclipse.tm.terminal.test