diff --git a/org.eclipse.buildship.gradleprop.feature/feature.properties b/org.eclipse.buildship.gradleprop.feature/feature.properties
index 670a9f0e0..b385f9cb2 100644
--- a/org.eclipse.buildship.gradleprop.feature/feature.properties
+++ b/org.eclipse.buildship.gradleprop.feature/feature.properties
@@ -1,6 +1,6 @@
 # "featureName" property - the name of the feature
 featureName=\
-Buildship: Eclipse Plug-ins for Gradle - gradle.properties editor support
+Buildship - gradle.properties editor support
 
 # "providerName" property - the name of the company providing the feature
 providerName=\
diff --git a/org.eclipse.buildship.gradleprop.provider/libs/language-server.jar b/org.eclipse.buildship.gradleprop.provider/libs/language-server.jar
index baf1b5982..279e3f555 100644
Binary files a/org.eclipse.buildship.gradleprop.provider/libs/language-server.jar and b/org.eclipse.buildship.gradleprop.provider/libs/language-server.jar differ
diff --git a/org.eclipse.buildship.kotlindsl.feature/feature.properties b/org.eclipse.buildship.kotlindsl.feature/feature.properties
index 19472c383..8749b024a 100644
--- a/org.eclipse.buildship.kotlindsl.feature/feature.properties
+++ b/org.eclipse.buildship.kotlindsl.feature/feature.properties
@@ -1,6 +1,6 @@
 # "featureName" property - the name of the feature
 featureName=\
-Kotlin DSL support
+Buildship - Kotlin DSL editor support
 
 # "providerName" property - the name of the company providing the feature
 providerName=\
diff --git a/org.eclipse.buildship.kotlindsl.feature/feature.xml b/org.eclipse.buildship.kotlindsl.feature/feature.xml
index ae7e5c1e3..64ee3af85 100644
--- a/org.eclipse.buildship.kotlindsl.feature/feature.xml
+++ b/org.eclipse.buildship.kotlindsl.feature/feature.xml
@@ -9,7 +9,7 @@
 -->
 <feature
       id="org.eclipse.buildship.kotlindsl"
-      label="Kotlin DSL Support"
+      label="%featureName"
       version="1.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.buildship.branding">
diff --git a/org.eclipse.buildship.oomph.feature/feature.properties b/org.eclipse.buildship.oomph.feature/feature.properties
index 8e8952944..95c7209cc 100644
--- a/org.eclipse.buildship.oomph.feature/feature.properties
+++ b/org.eclipse.buildship.oomph.feature/feature.properties
@@ -1,5 +1,5 @@
 featureName =\
-Buildship project import support for Oomph
+Buildship - project import support for Oomph
 
 description = Contains the setup model extension and edit support plugins for Gradle Import.