diff --git a/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF
index 0b0097b04..f7200a615 100644
--- a/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA CAst Java ECJ frontend
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.java.ecj
 Bundle-Version: 1.4.3.qualifier
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.ibm.wala.cast.java,
  com.ibm.wala.core,
diff --git a/com.ibm.wala.cast.java.ecj/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.java.ecj/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..fbf19ca94
--- /dev/null
+++ b/com.ibm.wala.cast.java.ecj/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.java.ecj
+Bundle-Name = WALA CAst Java ECJ frontend
+Bundle-Vendor = IBM
\ No newline at end of file
diff --git a/com.ibm.wala.cast.java.ecj/build.properties b/com.ibm.wala.cast.java.ecj/build.properties
index 34d2e4d2d..c58ea2178 100644
--- a/com.ibm.wala.cast.java.ecj/build.properties
+++ b/com.ibm.wala.cast.java.ecj/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/
diff --git a/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF
index 9eb929d8f..84706b6c8 100644
--- a/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Data Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.java.test.data
 Bundle-Version: 1.4.3.qualifier
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/com.ibm.wala.cast.java.test.data/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.java.test.data/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..30a68a126
--- /dev/null
+++ b/com.ibm.wala.cast.java.test.data/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.java.test.data
+Bundle-Vendor = IBM
+Bundle-Name = Data Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.cast.java.test.data/build.properties b/com.ibm.wala.cast.java.test.data/build.properties
index 34d2e4d2d..fc6c97e1c 100644
--- a/com.ibm.wala.cast.java.test.data/build.properties
+++ b/com.ibm.wala.cast.java.test.data/build.properties
@@ -1,4 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
diff --git a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
index 83bf7c428..a087282d9 100644
--- a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Java AST WALA Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.java.test
 Bundle-Version: 1.4.3.qualifier
 Bundle-Activator: com.ibm.wala.cast.java.test.TestPlugin
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.core.tests,
  com.ibm.wala.cast.java,
  com.ibm.wala.cast,
diff --git a/com.ibm.wala.cast.java.test/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.java.test/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..e83a1be80
--- /dev/null
+++ b/com.ibm.wala.cast.java.test/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.java.test
+Bundle-Vendor = IBM
+Bundle-Name = Java AST WALA Test Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.cast.java.test/build.properties b/com.ibm.wala.cast.java.test/build.properties
index 0e37e2191..6138c1ade 100644
--- a/com.ibm.wala.cast.java.test/build.properties
+++ b/com.ibm.wala.cast.java.test/build.properties
@@ -1,5 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
index d9ab51b5c..7af9abf12 100644
--- a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Java Source WALA Front End
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.java
 Bundle-Version: 1.4.3.qualifier
-Bundle-Vendor: rfuhrer@watson.ibm.com
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.cast,
  com.ibm.wala.core,
  com.ibm.wala.shrike
diff --git a/com.ibm.wala.cast.java/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.java/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..06394f033
--- /dev/null
+++ b/com.ibm.wala.cast.java/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.java
+Bundle-Vendor = rfuhrer@watson.ibm.com
+Bundle-Name = Java Source WALA Front End
\ No newline at end of file
diff --git a/com.ibm.wala.cast.java/build.properties b/com.ibm.wala.cast.java/build.properties
index 0e37e2191..6138c1ade 100644
--- a/com.ibm.wala.cast.java/build.properties
+++ b/com.ibm.wala.cast.java/build.properties
@@ -1,5 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
index 7ce30a235..0c0c25f53 100644
--- a/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Nu_validator
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.html.nu_validator
 Bundle-Version: 1.4.3.qualifier
 Export-Package: com.ibm.wala.cast.js.html.nu_validator
diff --git a/com.ibm.wala.cast.js.html.nu_validator/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.js.html.nu_validator/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..12b3bcfe2
--- /dev/null
+++ b/com.ibm.wala.cast.js.html.nu_validator/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.cast.js.html.nu_validator
+Bundle-Name = Nu_validator
\ No newline at end of file
diff --git a/com.ibm.wala.cast.js.html.nu_validator/build.properties b/com.ibm.wala.cast.js.html.nu_validator/build.properties
index b072e0847..26aec2dd2 100644
--- a/com.ibm.wala.cast.js.html.nu_validator/build.properties
+++ b/com.ibm.wala.cast.js.html.nu_validator/build.properties
@@ -2,7 +2,9 @@ source.. = src/,\
            tests/
 bin.includes = META-INF/,\
                .,\
-               lib/htmlparser-1.4.jar
+               lib/htmlparser-1.4.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 jars.extra.classpath = lib/htmlparser-1.4.jar
 javacProjectSettings = true
                
\ No newline at end of file
diff --git a/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF
index 40dff8bd5..85e7b4506 100644
--- a/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Test
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.nodejs.test
 Bundle-Version: 1.4.3.qualifier
 Export-Package: NodejsRequireJsonTest,
diff --git a/com.ibm.wala.cast.js.nodejs.test/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.js.nodejs.test/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..ecc17f416
--- /dev/null
+++ b/com.ibm.wala.cast.js.nodejs.test/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.cast.js.nodejs.test
+Bundle-Name = Test
\ No newline at end of file
diff --git a/com.ibm.wala.cast.js.nodejs.test/build.properties b/com.ibm.wala.cast.js.nodejs.test/build.properties
index a8bb7f29f..12f513af0 100644
--- a/com.ibm.wala.cast.js.nodejs.test/build.properties
+++ b/com.ibm.wala.cast.js.nodejs.test/build.properties
@@ -1,5 +1,7 @@
 source.. = src/,\
            testdata/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
index e0fcd5858..17d65c5f3 100644
--- a/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Nodejs
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.nodejs
 Bundle-Version: 1.4.3.qualifier
 Export-Package: com.ibm.wala.cast.js.nodejs
diff --git a/com.ibm.wala.cast.js.nodejs/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.js.nodejs/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..aeebfecec
--- /dev/null
+++ b/com.ibm.wala.cast.js.nodejs/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.cast.js.nodejs
+Bundle-Name = Nodejs
\ No newline at end of file
diff --git a/com.ibm.wala.cast.js.nodejs/build.properties b/com.ibm.wala.cast.js.nodejs/build.properties
index 05db5899c..aaec1f804 100644
--- a/com.ibm.wala.cast.js.nodejs/build.properties
+++ b/com.ibm.wala.cast.js.nodejs/build.properties
@@ -2,5 +2,7 @@ source.. = src/,\
            dat/
 bin.includes = META-INF/,\
                .,\
-               lib/json-20160212.jar
+               lib/json-20160212.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
index 83b98d618..d5f4a16ea 100644
--- a/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.rhino.test
 Bundle-Version: 1.4.3.qualifier
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.cast.js.rhino;bundle-version="1.0.0",
  com.ibm.wala.cast.js;bundle-version="1.0.0",
  com.ibm.wala.cast;bundle-version="1.0.0",
diff --git a/com.ibm.wala.cast.js.rhino.test/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.js.rhino.test/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..86f31eb43
--- /dev/null
+++ b/com.ibm.wala.cast.js.rhino.test/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.js.rhino.test
+Bundle-Vendor = IBM
+Bundle-Name = Test Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.cast.js.rhino.test/build.properties b/com.ibm.wala.cast.js.rhino.test/build.properties
index ae9ba3e1d..e19e77648 100644
--- a/com.ibm.wala.cast.js.rhino.test/build.properties
+++ b/com.ibm.wala.cast.js.rhino.test/build.properties
@@ -2,5 +2,7 @@ source.. = harness-src/
 output.. = bin/,\
            /com.ibm.wala.cast.js.test.data/examples-src/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
index f5ce05301..dcd6d6115 100644
--- a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Rhino Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.rhino
 Bundle-Version: 1.4.3.qualifier
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
  com.ibm.wala.cast.js;bundle-version="1.0.0",
  com.ibm.wala.core;bundle-version="1.1.3"
diff --git a/com.ibm.wala.cast.js.rhino/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.js.rhino/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..8904c72c8
--- /dev/null
+++ b/com.ibm.wala.cast.js.rhino/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.js.rhino
+Bundle-Vendor = IBM
+Bundle-Name = Rhino Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.cast.js.rhino/build.properties b/com.ibm.wala.cast.js.rhino/build.properties
index b6fcc0a3c..aa311189f 100644
--- a/com.ibm.wala.cast.js.rhino/build.properties
+++ b/com.ibm.wala.cast.js.rhino/build.properties
@@ -2,6 +2,8 @@ source.. = source/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/rhino-1.7.6.jar
+               lib/rhino-1.7.6.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 jars.extra.classpath = lib/rhino-1.7.6.jar
 javacProjectSettings = true
diff --git a/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF
index 5fb9f4400..5a3c8504d 100644
--- a/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA JavaScript Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.test
 Bundle-Version: 1.4.3.qualifier
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.cast.js,
  com.ibm.wala.cast,
  com.ibm.wala.core,
diff --git a/com.ibm.wala.cast.js.test/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.js.test/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..186f0075f
--- /dev/null
+++ b/com.ibm.wala.cast.js.test/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.js.test
+Bundle-Vendor = IBM
+Bundle-Name = WALA JavaScript Test Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.cast.js.test/build.properties b/com.ibm.wala.cast.js.test/build.properties
index 5e5e18caf..86cc47e14 100644
--- a/com.ibm.wala.cast.js.test/build.properties
+++ b/com.ibm.wala.cast.js.test/build.properties
@@ -1,5 +1,7 @@
 source.. =  harness-src
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
index dee85baf4..ca97f9cbe 100644
--- a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JavaScript Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js;singleton:=true
 Bundle-Version: 1.4.3.qualifier
 Bundle-ClassPath: .,
  lib/jericho-html-3.2.jar
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Export-Package: .,
  com.ibm.wala.cast.js.analysis.typeInference,
  com.ibm.wala.cast.js.callgraph.fieldbased,
diff --git a/com.ibm.wala.cast.js/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.js/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..391d34633
--- /dev/null
+++ b/com.ibm.wala.cast.js/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.js
+Bundle-Vendor = IBM
+Bundle-Name = JavaScript Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.cast.js/build.properties b/com.ibm.wala.cast.js/build.properties
index dcdc9bc48..70992fe0b 100644
--- a/com.ibm.wala.cast.js/build.properties
+++ b/com.ibm.wala.cast.js/build.properties
@@ -1,7 +1,9 @@
 bin.includes = .,\
                META-INF/,\
                lib/,\
-               lib/jericho-html-3.2.jar
+               lib/jericho-html-3.2.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 source.. = source/,\
            dat/
 javacProjectSettings = true
diff --git a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
index 22c151809..763bdc3a7 100644
--- a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CAst Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.test
 Bundle-Version: 1.4.3.qualifier
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: 
  org.junit;bundle-version="4.0.0",
  com.ibm.wala.core.tests,
diff --git a/com.ibm.wala.cast.test/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast.test/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..c7fdd501b
--- /dev/null
+++ b/com.ibm.wala.cast.test/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.test
+Bundle-Vendor = IBM
+Bundle-Name = CAst Test Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.cast.test/build.properties b/com.ibm.wala.cast.test/build.properties
index 5e5e18caf..86cc47e14 100644
--- a/com.ibm.wala.cast.test/build.properties
+++ b/com.ibm.wala.cast.test/build.properties
@@ -1,5 +1,7 @@
 source.. =  harness-src
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.cast/META-INF/MANIFEST.MF b/com.ibm.wala.cast/META-INF/MANIFEST.MF
index 92237ee35..1af5ccd6f 100644
--- a/com.ibm.wala.cast/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA CAst core Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast
 Bundle-Version: 1.4.3.qualifier
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.core,
  com.ibm.wala.shrike
 Bundle-ActivationPolicy: lazy
diff --git a/com.ibm.wala.cast/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.cast/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..abd872924
--- /dev/null
+++ b/com.ibm.wala.cast/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast
+Bundle-Vendor = IBM
+Bundle-Name = WALA CAst core Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.cast/build.properties b/com.ibm.wala.cast/build.properties
index 444e63421..ab2f2a2a4 100644
--- a/com.ibm.wala.cast/build.properties
+++ b/com.ibm.wala.cast/build.properties
@@ -1,6 +1,8 @@
 source.. =  source/java/
 output.. = bin/
 bin.includes = META-INF/,\
-	           lib/commons-io-2.4.jar,\
-               .
+               lib/commons-io-2.4.jar,\
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF b/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
index 851929507..b44fdcdc2 100644
--- a/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Testdata Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.core.testdata
 Bundle-Version: 1.4.3.qualifier
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BuddyPolicy: registered
diff --git a/com.ibm.wala.core.testdata/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.core.testdata/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..46b968c72
--- /dev/null
+++ b/com.ibm.wala.core.testdata/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.core.testdata
+Bundle-Vendor = IBM
+Bundle-Name = Testdata Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.core.testdata/build.properties b/com.ibm.wala.core.testdata/build.properties
index 541baae83..e92144e3e 100644
--- a/com.ibm.wala.core.testdata/build.properties
+++ b/com.ibm.wala.core.testdata/build.properties
@@ -7,5 +7,7 @@ bin.includes = META-INF/,\
                bcel-5.2.jar,\
                java-cup-11a.jar,\
                com.ibm.wala.core.testdata_1.0.0.jar,\
-               com.ibm.wala.core.testdata_1.0.0a.jar
+               com.ibm.wala.core.testdata_1.0.0a.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
                
\ No newline at end of file
diff --git a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
index 0c3a2adb0..3abfb76f6 100644
--- a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WalaDalvikBytecodeTests
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.dalvik.test
 Bundle-Version: 1.4.3.qualifier
 Bundle-Activator: com.ibm.wala.dalvik.test.Activator
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
  com.ibm.wala.core.testdata;bundle-version="1.3.4",
  com.ibm.wala.core.tests;bundle-version="1.3.4",
diff --git a/com.ibm.wala.dalvik.test/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.dalvik.test/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..5f14872e4
--- /dev/null
+++ b/com.ibm.wala.dalvik.test/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.dalvik.test
+Bundle-Vendor = IBM
+Bundle-Name = WalaDalvikBytecodeTests
\ No newline at end of file
diff --git a/com.ibm.wala.dalvik.test/build.properties b/com.ibm.wala.dalvik.test/build.properties
index 8b3758043..da05b13d1 100644
--- a/com.ibm.wala.dalvik.test/build.properties
+++ b/com.ibm.wala.dalvik.test/build.properties
@@ -2,7 +2,9 @@ source.. = source/,\
            data/
 output.. = bin/
 bin.includes = META-INF/,\
-	       lib/dx.jar
+               lib/dx.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 jars.extra.classpath = lib/dx.jar
 jre.compilation.profile = JavaSE-1.7
 javacProjectSettings = true
diff --git a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
index 9966d467c..726b2de16 100644
--- a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA Dalvik Bytecode Frontend
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.dalvik
 Bundle-Version: 1.4.3.qualifier
 Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
diff --git a/com.ibm.wala.dalvik/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.dalvik/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..c3190e30e
--- /dev/null
+++ b/com.ibm.wala.dalvik/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.dalvik
+Bundle-Name = WALA Dalvik Bytecode Frontend
\ No newline at end of file
diff --git a/com.ibm.wala.dalvik/build.properties b/com.ibm.wala.dalvik/build.properties
index 823229746..685ea2292 100644
--- a/com.ibm.wala.dalvik/build.properties
+++ b/com.ibm.wala.dalvik/build.properties
@@ -1,12 +1,14 @@
 bin.includes = META-INF/,\
-	       .,\
+               .,\
                lib/commons-cli-1.2.jar,\
                lib/commons-io-2.4.jar,\
                lib/dexlib-1.3.4.jar,\
                lib/guava-13.0.1.jar,\
                lib/logback-classic-1.0.9.jar,\
                lib/logback-core-1.0.9.jar,\
-               lib/slf4j-api-1.7.2.jar
+               lib/slf4j-api-1.7.2.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 jars.compile.order = .
 output.. = bin/
 source.. = src/
diff --git a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
index 957363908..babbbb670 100644
--- a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA CAst Java JDT Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.ide.jdt.test
 Bundle-Version: 1.4.3.qualifier
 Bundle-Activator: com.ibm.wala.cast.java.jdt.test.Activator
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.cast.java.test;bundle-version="1.0.0",
  com.ibm.wala.cast.test;bundle-version="1.0.0",
  com.ibm.wala.ide.tests;bundle-version="1.1.3",
diff --git a/com.ibm.wala.ide.jdt.test/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.ide.jdt.test/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..d3d9ce4db
--- /dev/null
+++ b/com.ibm.wala.ide.jdt.test/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.ide.jdt.test
+Bundle-Vendor = IBM
+Bundle-Name = WALA CAst Java JDT Test Plug-in
\ No newline at end of file
diff --git a/com.ibm.wala.ide.jdt.test/build.properties b/com.ibm.wala.ide.jdt.test/build.properties
index cd65ac0f7..07ccc811a 100644
--- a/com.ibm.wala.ide.jdt.test/build.properties
+++ b/com.ibm.wala.ide.jdt.test/build.properties
@@ -2,6 +2,8 @@ source.. = source/,\
            data/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 jre.compilation.profile = JavaSE-1.7
 javacProjectSettings = true
diff --git a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
index a840af206..5b1d4fc4e 100644
--- a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA IDE JDT components
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.ide.jdt
 Bundle-Version: 1.4.3.qualifier
 Bundle-Activator: com.ibm.wala.ide.jdt.Activator
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  com.ibm.wala.cast,
diff --git a/com.ibm.wala.ide.jdt/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.ide.jdt/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..5ec75380b
--- /dev/null
+++ b/com.ibm.wala.ide.jdt/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.ide.jdt
+Bundle-Vendor = IBM
+Bundle-Name = WALA IDE JDT components
\ No newline at end of file
diff --git a/com.ibm.wala.ide.jdt/build.properties b/com.ibm.wala.ide.jdt/build.properties
index 818b549d5..30d199552 100644
--- a/com.ibm.wala.ide.jdt/build.properties
+++ b/com.ibm.wala.ide.jdt/build.properties
@@ -1,5 +1,7 @@
 source.. = source/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF
index 05b413c8f..2fd8d09e4 100644
--- a/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JSDT Tests
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.ide.jsdt.tests;singleton:=true
 Bundle-Version: 1.4.3.qualifier
 Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
diff --git a/com.ibm.wala.ide.jsdt.tests/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.ide.jsdt.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..97f57d4f5
--- /dev/null
+++ b/com.ibm.wala.ide.jsdt.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.ide.jsdt.tests
+Bundle-Name = JSDT Tests
\ No newline at end of file
diff --git a/com.ibm.wala.ide.jsdt.tests/build.properties b/com.ibm.wala.ide.jsdt.tests/build.properties
index 38b35d2ed..8cadc38f8 100644
--- a/com.ibm.wala.ide.jsdt.tests/build.properties
+++ b/com.ibm.wala.ide.jsdt.tests/build.properties
@@ -1,4 +1,6 @@
 source.. = src/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
index 0ca7e5340..80f33416f 100644
--- a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Jsdt
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.ide.jsdt
 Bundle-Version: 1.4.3.qualifier
 Bundle-Activator: com.ibm.wala.ide.jsdt.Activator
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
  com.ibm.wala.cast,
  com.ibm.wala.cast.js,
diff --git a/com.ibm.wala.ide.jsdt/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.ide.jsdt/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..14581acdb
--- /dev/null
+++ b/com.ibm.wala.ide.jsdt/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.ide.jsdt
+Bundle-Vendor = IBM
+Bundle-Name = Jsdt
\ No newline at end of file
diff --git a/com.ibm.wala.ide.jsdt/build.properties b/com.ibm.wala.ide.jsdt/build.properties
index 818b549d5..30d199552 100644
--- a/com.ibm.wala.ide.jsdt/build.properties
+++ b/com.ibm.wala.ide.jsdt/build.properties
@@ -1,5 +1,7 @@
 source.. = source/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 javacProjectSettings = true
diff --git a/com.ibm.wala.scandroid/META-INF/MANIFEST.MF b/com.ibm.wala.scandroid/META-INF/MANIFEST.MF
index affef333a..e39ff2f91 100644
--- a/com.ibm.wala.scandroid/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.scandroid/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SCanDroid
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.scandroid
 Bundle-Version: 1.4.3.qualifier
 Bundle-Activator: com.ibm.wala.scandroid.Activator
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.dalvik;bundle-version="1.3.4",
  com.ibm.wala.core;bundle-version="1.3.4",
  com.ibm.wala.shrike;bundle-version="1.3.4"
diff --git a/com.ibm.wala.scandroid/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.scandroid/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..3e61579a6
--- /dev/null
+++ b/com.ibm.wala.scandroid/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.scandroid
+Bundle-Vendor = IBM
+Bundle-Name = SCanDroid
\ No newline at end of file
diff --git a/com.ibm.wala.scandroid/build.properties b/com.ibm.wala.scandroid/build.properties
index c820afa01..8fba54f7c 100644
--- a/com.ibm.wala.scandroid/build.properties
+++ b/com.ibm.wala.scandroid/build.properties
@@ -1,4 +1,6 @@
 source.. = source/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
diff --git a/com.ibm.wala.util/META-INF/MANIFEST.MF b/com.ibm.wala.util/META-INF/MANIFEST.MF
index 6d6e6c366..4f8a353fa 100644
--- a/com.ibm.wala.util/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.util/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA Util
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.util
 Bundle-Version: 1.4.3.qualifier
 Export-Package: com.ibm.wala.dataflow.graph,
@@ -24,5 +24,5 @@ Export-Package: com.ibm.wala.dataflow.graph,
  com.ibm.wala.util.processes,
  com.ibm.wala.util.tables,
  com.ibm.wala.viz
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/com.ibm.wala.util/OSGI-INF/l10n/bundle.properties b/com.ibm.wala.util/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..c0c84b0d5
--- /dev/null
+++ b/com.ibm.wala.util/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.util
+Bundle-Vendor = IBM
+Bundle-Name = WALA Util
\ No newline at end of file
diff --git a/com.ibm.wala.util/build.properties b/com.ibm.wala.util/build.properties
index 10f162cee..07d0abe02 100644
--- a/com.ibm.wala.util/build.properties
+++ b/com.ibm.wala.util/build.properties
@@ -1,5 +1,7 @@
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 jars.compile.order = .
 source.. = src/
 output.. = bin/