From 01ea35ccb7546840ca6abf567b5d0c57fa9f81be Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Wed, 16 Aug 2017 11:09:55 -0500
Subject: [PATCH] Rename "...-feature" to "..._feature" in subdirs and features

This change affects both top-level subdirectory names as well as
Eclipse plug-in feature names.  Perhaps it would have been possible to
change only the latter, but I don't like the idea of the two being
different.

These name changes fix three Eclipse plug-in warnings of the form:

	Illegal value '...-feature' for attribute 'id'.
	Legal token characters are "a-z", "A-Z", "0-9", "_".  Tokens
	must be separated by "."

I'll be the first to admit that I know nearly nothing about Eclipse
plug-in development.  If changing these plug-in feature IDs has
broader implications that the automated regression tests won't detect,
then I probably overlooked them too.  I would greatly appreciate
skeptical review of this change by someone who knows Eclipse plug-in
development well.

Note that personal Eclipse workspaces may need some manual adjustment
after this change.  The three "...-feature" Eclipse projects should be
removed from the workspace, and the three corresponding "..._feature"
Eclipse projects should be added.  If you do your git pull using
Eclipse's team features, perhaps it is smart enough to do this for
you?  I don't know, but it wouldn't surprise me if fixing things
manually were still needed even in that case.
---
 com.ibm.wala-repository/category.xml                      | 8 ++++----
 .../launchers/#com.ibm.wala.ide.jdt.test.launch#          | 6 +++---
 .../launchers/JDTJava15IRTests.launch                     | 8 ++++----
 .../launchers/com.ibm.wala.ide.jsdt.tests.launch          | 6 +++---
 .../.project                                              | 2 +-
 .../.settings/org.eclipse.wst.validation.prefs            | 0
 .../build.properties                                      | 0
 .../feature.properties                                    | 0
 .../feature.xml                                           | 2 +-
 .../pom.xml                                               | 2 +-
 .../.project                                              | 2 +-
 .../.settings/org.eclipse.wst.validation.prefs            | 0
 .../build.properties                                      | 0
 .../feature.properties                                    | 0
 .../feature.xml                                           | 0
 .../pom.xml                                               | 0
 .../.project                                              | 2 +-
 .../.settings/org.eclipse.wst.validation.prefs            | 0
 .../build.properties                                      | 0
 .../feature.properties                                    | 0
 .../feature.xml                                           | 2 +-
 .../pom.xml                                               | 2 +-
 {com.ibm.wala-feature => com.ibm.wala_feature}/.project   | 2 +-
 .../.settings/org.eclipse.wst.validation.prefs            | 0
 .../build.properties                                      | 0
 .../feature.properties                                    | 0
 .../feature.xml                                           | 2 +-
 {com.ibm.wala-feature => com.ibm.wala_feature}/pom.xml    | 2 +-
 pom.xml                                                   | 4 ++--
 29 files changed, 26 insertions(+), 26 deletions(-)
 rename {com.ibm.wala.ide-feature => com.ibm.wala.ide_feature}/.project (89%)
 rename {com.ibm.wala-feature => com.ibm.wala.ide_feature}/.settings/org.eclipse.wst.validation.prefs (100%)
 rename {com.ibm.wala-feature => com.ibm.wala.ide_feature}/build.properties (100%)
 rename {com.ibm.wala.ide-feature => com.ibm.wala.ide_feature}/feature.properties (100%)
 rename {com.ibm.wala.ide-feature => com.ibm.wala.ide_feature}/feature.xml (89%)
 rename {com.ibm.wala.ide-feature => com.ibm.wala.ide_feature}/pom.xml (90%)
 rename {com.ibm.wala.tests.ide-feature => com.ibm.wala.tests.ide_feature}/.project (88%)
 rename {com.ibm.wala.tests-feature => com.ibm.wala.tests.ide_feature}/.settings/org.eclipse.wst.validation.prefs (100%)
 rename {com.ibm.wala.tests-feature => com.ibm.wala.tests.ide_feature}/build.properties (100%)
 rename {com.ibm.wala.tests.ide-feature => com.ibm.wala.tests.ide_feature}/feature.properties (100%)
 rename {com.ibm.wala.tests.ide-feature => com.ibm.wala.tests.ide_feature}/feature.xml (100%)
 rename {com.ibm.wala.tests.ide-feature => com.ibm.wala.tests.ide_feature}/pom.xml (100%)
 rename {com.ibm.wala.tests-feature => com.ibm.wala.tests_feature}/.project (89%)
 rename {com.ibm.wala.tests.ide-feature => com.ibm.wala.tests_feature}/.settings/org.eclipse.wst.validation.prefs (100%)
 rename {com.ibm.wala.tests.ide-feature => com.ibm.wala.tests_feature}/build.properties (100%)
 rename {com.ibm.wala.tests-feature => com.ibm.wala.tests_feature}/feature.properties (100%)
 rename {com.ibm.wala.tests-feature => com.ibm.wala.tests_feature}/feature.xml (95%)
 rename {com.ibm.wala.tests-feature => com.ibm.wala.tests_feature}/pom.xml (89%)
 rename {com.ibm.wala-feature => com.ibm.wala_feature}/.project (90%)
 rename {com.ibm.wala.ide-feature => com.ibm.wala_feature}/.settings/org.eclipse.wst.validation.prefs (100%)
 rename {com.ibm.wala.ide-feature => com.ibm.wala_feature}/build.properties (100%)
 rename {com.ibm.wala-feature => com.ibm.wala_feature}/feature.properties (100%)
 rename {com.ibm.wala-feature => com.ibm.wala_feature}/feature.xml (96%)
 rename {com.ibm.wala-feature => com.ibm.wala_feature}/pom.xml (90%)

diff --git a/com.ibm.wala-repository/category.xml b/com.ibm.wala-repository/category.xml
index 091568633..95cf632d1 100644
--- a/com.ibm.wala-repository/category.xml
+++ b/com.ibm.wala-repository/category.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-    <feature id="com.ibm.wala-feature">
+    <feature id="com.ibm.wala_feature">
         <category name="main"/>
     </feature>
-    <feature id="com.ibm.wala-feature.source">
+    <feature id="com.ibm.wala_feature.source">
         <category name="main"/>
     </feature>
-    <feature id="com.ibm.wala.ide-feature">
+    <feature id="com.ibm.wala.ide_feature">
         <category name="main"/>
     </feature>
-    <feature id="com.ibm.wala.ide-feature.source">
+    <feature id="com.ibm.wala.ide_feature.source">
         <category name="main"/>
     </feature>
    <category-def name="main" label="Wala"/>
diff --git a/com.ibm.wala.ide.jdt.test/launchers/#com.ibm.wala.ide.jdt.test.launch# b/com.ibm.wala.ide.jdt.test/launchers/#com.ibm.wala.ide.jdt.test.launch#
index 44bf6c52b..c47e887d9 100644
--- a/com.ibm.wala.ide.jdt.test/launchers/#com.ibm.wala.ide.jdt.test.launch#
+++ b/com.ibm.wala.ide.jdt.test/launchers/#com.ibm.wala.ide.jdt.test.launch#
@@ -40,9 +40,9 @@
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
 <setAttribute key="selected_features">
-<setEntry value="com.ibm.wala-feature:default"/>
-<setEntry value="com.ibm.wala.ide-feature:default"/>
-<setEntry value="com.ibm.wala.tests-feature:default"/>
+<setEntry value="com.ibm.wala_feature:default"/>
+<setEntry value="com.ibm.wala.ide_feature:default"/>
+<setEntry value="com.ibm.wala.tests_feature:default"/>
 <setEntry value="com.ibm.wala.tests.ide:default"/>
 <setEntry value="org.eclipse.e4.rcp:default"/>
 <setEntry value="org.eclipse.ecf.core.feature:default"/>
diff --git a/com.ibm.wala.ide.jdt.test/launchers/JDTJava15IRTests.launch b/com.ibm.wala.ide.jdt.test/launchers/JDTJava15IRTests.launch
index 7dbd1635c..8704dc608 100644
--- a/com.ibm.wala.ide.jdt.test/launchers/JDTJava15IRTests.launch
+++ b/com.ibm.wala.ide.jdt.test/launchers/JDTJava15IRTests.launch
@@ -39,11 +39,11 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.ibm.wala.tracefile=/tmp/jdt15tests.txt -Xmx1024M -XX:MaxPermSize=256M -ea"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
+<booleanAttribute key="run_in_ui_thread" com.ibm.wala_featurevalue="false"/>
 <setAttribute key="selected_features">
-<setEntry value="com.ibm.wala-feature:default"/>
-<setEntry value="com.ibm.wala.ide-feature:default"/>
-<setEntry value="com.ibm.wala.tests-feature:default"/>
+<setEntry value="com.ibm.wala_feature:default"/>
+<setEntry value="com.ibm.wala.ide_feature:default"/>
+<setEntry value="com.ibm.wala.tests_feature:default"/>
 <setEntry value="com.ibm.wala.tests.ide:default"/>
 </setAttribute>
 <stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.platform@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
diff --git a/com.ibm.wala.ide.jsdt.tests/launchers/com.ibm.wala.ide.jsdt.tests.launch b/com.ibm.wala.ide.jsdt.tests/launchers/com.ibm.wala.ide.jsdt.tests.launch
index 99a88826e..c32eeee38 100644
--- a/com.ibm.wala.ide.jsdt.tests/launchers/com.ibm.wala.ide.jsdt.tests.launch
+++ b/com.ibm.wala.ide.jsdt.tests/launchers/com.ibm.wala.ide.jsdt.tests.launch
@@ -41,9 +41,9 @@
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
 <setAttribute key="selected_features">
-<setEntry value="com.ibm.wala-feature:default"/>
-<setEntry value="com.ibm.wala.ide-feature:default"/>
-<setEntry value="com.ibm.wala.tests-feature:default"/>
+<setEntry value="com.ibm.wala_feature:default"/>
+<setEntry value="com.ibm.wala.ide_feature:default"/>
+<setEntry value="com.ibm.wala.tests_feature:default"/>
 <setEntry value="com.ibm.wala.tests.ide:default"/>
 <setEntry value="org.eclipse.e4.rcp:default"/>
 <setEntry value="org.eclipse.ecf.core.feature:default"/>
diff --git a/com.ibm.wala.ide-feature/.project b/com.ibm.wala.ide_feature/.project
similarity index 89%
rename from com.ibm.wala.ide-feature/.project
rename to com.ibm.wala.ide_feature/.project
index 8d9448d57..6b957cabe 100644
--- a/com.ibm.wala.ide-feature/.project
+++ b/com.ibm.wala.ide_feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.ibm.wala.ide-feature</name>
+	<name>com.ibm.wala.ide_feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/com.ibm.wala-feature/.settings/org.eclipse.wst.validation.prefs b/com.ibm.wala.ide_feature/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from com.ibm.wala-feature/.settings/org.eclipse.wst.validation.prefs
rename to com.ibm.wala.ide_feature/.settings/org.eclipse.wst.validation.prefs
diff --git a/com.ibm.wala-feature/build.properties b/com.ibm.wala.ide_feature/build.properties
similarity index 100%
rename from com.ibm.wala-feature/build.properties
rename to com.ibm.wala.ide_feature/build.properties
diff --git a/com.ibm.wala.ide-feature/feature.properties b/com.ibm.wala.ide_feature/feature.properties
similarity index 100%
rename from com.ibm.wala.ide-feature/feature.properties
rename to com.ibm.wala.ide_feature/feature.properties
diff --git a/com.ibm.wala.ide-feature/feature.xml b/com.ibm.wala.ide_feature/feature.xml
similarity index 89%
rename from com.ibm.wala.ide-feature/feature.xml
rename to com.ibm.wala.ide_feature/feature.xml
index 8d250c263..4732ec536 100644
--- a/com.ibm.wala.ide-feature/feature.xml
+++ b/com.ibm.wala.ide_feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="com.ibm.wala.ide-feature"
+      id="com.ibm.wala.ide_feature"
       label="%featureName"
       version="1.4.4.qualifier"
       provider-name="%providerName">
diff --git a/com.ibm.wala.ide-feature/pom.xml b/com.ibm.wala.ide_feature/pom.xml
similarity index 90%
rename from com.ibm.wala.ide-feature/pom.xml
rename to com.ibm.wala.ide_feature/pom.xml
index 1c1a180fc..c4e64a308 100644
--- a/com.ibm.wala.ide-feature/pom.xml
+++ b/com.ibm.wala.ide_feature/pom.xml
@@ -7,6 +7,6 @@
         <groupId>com.ibm.wala</groupId>
         <version>1.4.4-SNAPSHOT</version>
     </parent>
-  <artifactId>com.ibm.wala.ide-feature</artifactId>
+  <artifactId>com.ibm.wala.ide_feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/com.ibm.wala.tests.ide-feature/.project b/com.ibm.wala.tests.ide_feature/.project
similarity index 88%
rename from com.ibm.wala.tests.ide-feature/.project
rename to com.ibm.wala.tests.ide_feature/.project
index 7670b6ef9..9b48674b4 100644
--- a/com.ibm.wala.tests.ide-feature/.project
+++ b/com.ibm.wala.tests.ide_feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.ibm.wala.tests.ide-feature</name>
+	<name>com.ibm.wala.tests.ide_feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/com.ibm.wala.tests-feature/.settings/org.eclipse.wst.validation.prefs b/com.ibm.wala.tests.ide_feature/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from com.ibm.wala.tests-feature/.settings/org.eclipse.wst.validation.prefs
rename to com.ibm.wala.tests.ide_feature/.settings/org.eclipse.wst.validation.prefs
diff --git a/com.ibm.wala.tests-feature/build.properties b/com.ibm.wala.tests.ide_feature/build.properties
similarity index 100%
rename from com.ibm.wala.tests-feature/build.properties
rename to com.ibm.wala.tests.ide_feature/build.properties
diff --git a/com.ibm.wala.tests.ide-feature/feature.properties b/com.ibm.wala.tests.ide_feature/feature.properties
similarity index 100%
rename from com.ibm.wala.tests.ide-feature/feature.properties
rename to com.ibm.wala.tests.ide_feature/feature.properties
diff --git a/com.ibm.wala.tests.ide-feature/feature.xml b/com.ibm.wala.tests.ide_feature/feature.xml
similarity index 100%
rename from com.ibm.wala.tests.ide-feature/feature.xml
rename to com.ibm.wala.tests.ide_feature/feature.xml
diff --git a/com.ibm.wala.tests.ide-feature/pom.xml b/com.ibm.wala.tests.ide_feature/pom.xml
similarity index 100%
rename from com.ibm.wala.tests.ide-feature/pom.xml
rename to com.ibm.wala.tests.ide_feature/pom.xml
diff --git a/com.ibm.wala.tests-feature/.project b/com.ibm.wala.tests_feature/.project
similarity index 89%
rename from com.ibm.wala.tests-feature/.project
rename to com.ibm.wala.tests_feature/.project
index 9484313e4..4e348e734 100644
--- a/com.ibm.wala.tests-feature/.project
+++ b/com.ibm.wala.tests_feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.ibm.wala.tests-feature</name>
+	<name>com.ibm.wala.tests_feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/com.ibm.wala.tests.ide-feature/.settings/org.eclipse.wst.validation.prefs b/com.ibm.wala.tests_feature/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from com.ibm.wala.tests.ide-feature/.settings/org.eclipse.wst.validation.prefs
rename to com.ibm.wala.tests_feature/.settings/org.eclipse.wst.validation.prefs
diff --git a/com.ibm.wala.tests.ide-feature/build.properties b/com.ibm.wala.tests_feature/build.properties
similarity index 100%
rename from com.ibm.wala.tests.ide-feature/build.properties
rename to com.ibm.wala.tests_feature/build.properties
diff --git a/com.ibm.wala.tests-feature/feature.properties b/com.ibm.wala.tests_feature/feature.properties
similarity index 100%
rename from com.ibm.wala.tests-feature/feature.properties
rename to com.ibm.wala.tests_feature/feature.properties
diff --git a/com.ibm.wala.tests-feature/feature.xml b/com.ibm.wala.tests_feature/feature.xml
similarity index 95%
rename from com.ibm.wala.tests-feature/feature.xml
rename to com.ibm.wala.tests_feature/feature.xml
index ff6cbe818..d5cb7f346 100644
--- a/com.ibm.wala.tests-feature/feature.xml
+++ b/com.ibm.wala.tests_feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="com.ibm.wala.tests-feature"
+      id="com.ibm.wala.tests_feature"
       label="%featureName"
       version="1.4.4.qualifier"
       provider-name="%providerName">
diff --git a/com.ibm.wala.tests-feature/pom.xml b/com.ibm.wala.tests_feature/pom.xml
similarity index 89%
rename from com.ibm.wala.tests-feature/pom.xml
rename to com.ibm.wala.tests_feature/pom.xml
index eea87653b..9cbb92d7c 100644
--- a/com.ibm.wala.tests-feature/pom.xml
+++ b/com.ibm.wala.tests_feature/pom.xml
@@ -7,6 +7,6 @@
     <groupId>com.ibm.wala</groupId>
     <version>1.4.4-SNAPSHOT</version>
   </parent>
-  <artifactId>com.ibm.wala.tests-feature</artifactId>
+  <artifactId>com.ibm.wala.tests_feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/com.ibm.wala-feature/.project b/com.ibm.wala_feature/.project
similarity index 90%
rename from com.ibm.wala-feature/.project
rename to com.ibm.wala_feature/.project
index 48c667c2d..0e1918b04 100644
--- a/com.ibm.wala-feature/.project
+++ b/com.ibm.wala_feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.ibm.wala-feature</name>
+	<name>com.ibm.wala_feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/com.ibm.wala.ide-feature/.settings/org.eclipse.wst.validation.prefs b/com.ibm.wala_feature/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from com.ibm.wala.ide-feature/.settings/org.eclipse.wst.validation.prefs
rename to com.ibm.wala_feature/.settings/org.eclipse.wst.validation.prefs
diff --git a/com.ibm.wala.ide-feature/build.properties b/com.ibm.wala_feature/build.properties
similarity index 100%
rename from com.ibm.wala.ide-feature/build.properties
rename to com.ibm.wala_feature/build.properties
diff --git a/com.ibm.wala-feature/feature.properties b/com.ibm.wala_feature/feature.properties
similarity index 100%
rename from com.ibm.wala-feature/feature.properties
rename to com.ibm.wala_feature/feature.properties
diff --git a/com.ibm.wala-feature/feature.xml b/com.ibm.wala_feature/feature.xml
similarity index 96%
rename from com.ibm.wala-feature/feature.xml
rename to com.ibm.wala_feature/feature.xml
index 3f15e74db..fe57a5847 100644
--- a/com.ibm.wala-feature/feature.xml
+++ b/com.ibm.wala_feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="com.ibm.wala-feature"
+      id="com.ibm.wala_feature"
       label="%featureName"
       version="1.4.4.qualifier"
       provider-name="%providerName">
diff --git a/com.ibm.wala-feature/pom.xml b/com.ibm.wala_feature/pom.xml
similarity index 90%
rename from com.ibm.wala-feature/pom.xml
rename to com.ibm.wala_feature/pom.xml
index c363e0b21..6dae52ce9 100644
--- a/com.ibm.wala-feature/pom.xml
+++ b/com.ibm.wala_feature/pom.xml
@@ -7,6 +7,6 @@
     <groupId>com.ibm.wala</groupId>
     <version>1.4.4-SNAPSHOT</version>
   </parent>
-  <artifactId>com.ibm.wala-feature</artifactId>
+  <artifactId>com.ibm.wala_feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index 7c37d3496..dbef851a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modules>
     <module>targets</module>
 
-    <module>com.ibm.wala-feature</module>
+    <module>com.ibm.wala_feature</module>
     <module>com.ibm.wala.core</module>
     <module>com.ibm.wala.shrike</module>
     <module>com.ibm.wala.util</module>
@@ -34,7 +34,7 @@
 
     <module>com.ibm.wala.cast.java.ecj</module>
     
-    <module>com.ibm.wala.ide-feature</module>
+    <module>com.ibm.wala.ide_feature</module>
     <module>com.ibm.wala.ide</module>
     <module>com.ibm.wala.ide.tests</module>