diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFDomainProvider.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFDomainsProvider.java
similarity index 93%
rename from vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFDomainProvider.java
rename to vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFDomainsProvider.java
index 235b162e2..141951149 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFDomainProvider.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFDomainsProvider.java
@@ -20,9 +20,9 @@ import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFTar
 import org.springframework.ide.vscode.commons.yaml.schema.BasicYValueHint;
 import org.springframework.ide.vscode.commons.yaml.schema.YValueHint;
 
-public class ManifestYamlCFDomainProvider extends AbstractCFHintsProvider {
+public class ManifestYamlCFDomainsProvider extends AbstractCFHintsProvider {
 
-	public ManifestYamlCFDomainProvider(CFTargetCache cache) {
+	public ManifestYamlCFDomainsProvider(CFTargetCache cache) {
 		super(cache);
 	}
 
diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java
index 9d5e46522..bce95e518 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServer.java
@@ -137,7 +137,7 @@ public class ManifestYamlLanguageServer extends SimpleLanguageServer {
 	}
 	
 	private Callable<Collection<YValueHint>> getDomainsProvider() {
-		return new ManifestYamlCFDomainProvider(getCfTargetCache());
+		return new ManifestYamlCFDomainsProvider(getCfTargetCache());
 	}
 
 	@Override