diff --git a/vscode-extensions/commons/application-properties-metadata/pom.xml b/vscode-extensions/commons/application-properties-metadata/pom.xml
index 5ae20b278..f0ede3136 100644
--- a/vscode-extensions/commons/application-properties-metadata/pom.xml
+++ b/vscode-extensions/commons/application-properties-metadata/pom.xml
@@ -43,7 +43,7 @@
  		<!-- Common Utilities -->	
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>util-commons</artifactId>
+			<artifactId>commons-util</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 				
diff --git a/vscode-extensions/commons/util-commons/.classpath b/vscode-extensions/commons/commons-util/.classpath
similarity index 100%
rename from vscode-extensions/commons/util-commons/.classpath
rename to vscode-extensions/commons/commons-util/.classpath
diff --git a/vscode-extensions/commons/util-commons/.project b/vscode-extensions/commons/commons-util/.project
similarity index 95%
rename from vscode-extensions/commons/util-commons/.project
rename to vscode-extensions/commons/commons-util/.project
index d33777c9c..cdabe168b 100644
--- a/vscode-extensions/commons/util-commons/.project
+++ b/vscode-extensions/commons/commons-util/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>util-commons</name>
+	<name>commons-util</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/vscode-extensions/commons/util-commons/.settings/org.eclipse.jdt.core.prefs b/vscode-extensions/commons/commons-util/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/util-commons/.settings/org.eclipse.jdt.core.prefs
rename to vscode-extensions/commons/commons-util/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/util-commons/.settings/org.eclipse.m2e.core.prefs b/vscode-extensions/commons/commons-util/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/util-commons/.settings/org.eclipse.m2e.core.prefs
rename to vscode-extensions/commons/commons-util/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/util-commons/pom.xml b/vscode-extensions/commons/commons-util/pom.xml
similarity index 86%
rename from vscode-extensions/commons/util-commons/pom.xml
rename to vscode-extensions/commons/commons-util/pom.xml
index 377e63200..904cf2425 100644
--- a/vscode-extensions/commons/util-commons/pom.xml
+++ b/vscode-extensions/commons/commons-util/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>util-commons</artifactId>
-  <name>util-commons</name>
+  <artifactId>commons-util</artifactId>
+  <name>commons-util</name>
   
   	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/Assert.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Assert.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/Assert.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Assert.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/CollectionUtil.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/CollectionUtil.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/CollectionUtil.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/CollectionUtil.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/Collector.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Collector.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/Collector.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Collector.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/ExceptionUtil.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExceptionUtil.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/ExceptionUtil.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExceptionUtil.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/ExternalCommand.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalCommand.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/ExternalCommand.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalCommand.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/ExternalProcess.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalProcess.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/ExternalProcess.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ExternalProcess.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/Futures.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Futures.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/Futures.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/Futures.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/FuzzyMatcher.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/FuzzyMatcher.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/FuzzyMatcher.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/FuzzyMatcher.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/IRequestor.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/IRequestor.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/IRequestor.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/IRequestor.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/ListenerList.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ListenerList.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/ListenerList.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/ListenerList.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/RememberLast.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/RememberLast.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/RememberLast.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/RememberLast.java
diff --git a/vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/StringUtil.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/StringUtil.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/main/java/org/springframework/ide/vscode/util/StringUtil.java
rename to vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/util/StringUtil.java
diff --git a/vscode-extensions/commons/util-commons/src/test/java/org/springframework/ide/vscode/util/StringUtilTest.java b/vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/util/StringUtilTest.java
similarity index 100%
rename from vscode-extensions/commons/util-commons/src/test/java/org/springframework/ide/vscode/util/StringUtilTest.java
rename to vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/util/StringUtilTest.java
diff --git a/vscode-extensions/commons/language-server-commons/pom.xml b/vscode-extensions/commons/language-server-commons/pom.xml
index 900f27817..9d6330f2c 100644
--- a/vscode-extensions/commons/language-server-commons/pom.xml
+++ b/vscode-extensions/commons/language-server-commons/pom.xml
@@ -27,7 +27,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>util-commons</artifactId>
+			<artifactId>commons-util</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<!--  testing -->
diff --git a/vscode-extensions/commons/pom.xml b/vscode-extensions/commons/pom.xml
index a332aa641..48c8e76b8 100644
--- a/vscode-extensions/commons/pom.xml
+++ b/vscode-extensions/commons/pom.xml
@@ -13,7 +13,7 @@
 		<module>language-server-commons</module>
 		<module>language-server-test-harness</module>
 		<module>yaml-commons</module>
-		<module>util-commons</module>
+		<module>commons-util</module>
 		<module>java-properties</module>
 		<module>application-properties-metadata</module>
 	</modules>
diff --git a/vscode-extensions/commons/yaml-commons/pom.xml b/vscode-extensions/commons/yaml-commons/pom.xml
index 384cfcdd5..561586226 100644
--- a/vscode-extensions/commons/yaml-commons/pom.xml
+++ b/vscode-extensions/commons/yaml-commons/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>util-commons</artifactId>
+			<artifactId>commons-util</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>