diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java
index 38809f841..b36884156 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java
@@ -91,7 +91,7 @@ public class BootJavaCompletionEngineConfigurer {
 		JavaProjectFinder javaProjectFinder = params.projectFinder;
 		Map<String, CompletionProvider> providers = new HashMap<>();
 		
-		providers.put(org.springframework.ide.vscode.boot.java.scope.Constants.SPRING_SCOPE, new ScopeCompletionProcessor());
+		providers.put(Annotations.SCOPE, new ScopeCompletionProcessor());
 		providers.put(Annotations.VALUE, new ValueCompletionProcessor(javaProjectFinder, indexProvider, adHocProperties));
 		providers.put(Annotations.REPOSITORY, new DataRepositoryCompletionProcessor());
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java
index 001df9b11..07d2f4b2b 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java
@@ -64,5 +64,6 @@ public class Annotations {
 	public static final String FEIGN_CLIENT = "org.springframework.cloud.openfeign.FeignClient";
 	
 	public static final String VALUE = "org.springframework.beans.factory.annotation.Value";
+	public static final String SCOPE = "org.springframework.context.annotation.Scope";
 
 }
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/Constants.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/Constants.java
deleted file mode 100644
index ca4c92654..000000000
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/Constants.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Pivotal, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.vscode.boot.java.scope;
-
-/**
- * @author Martin Lippert
- */
-public class Constants {
-
-	public static final String SPRING_SCOPE = "org.springframework.context.annotation.Scope";
-
-}