diff --git a/src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2ProxyAutoConfiguration.java b/src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2ProxyAutoConfiguration.java
index 8ae4728..461b2e5 100644
--- a/src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2ProxyAutoConfiguration.java
+++ b/src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2ProxyAutoConfiguration.java
@@ -34,8 +34,8 @@ import com.netflix.zuul.ZuulFilter;
 public class OAuth2ProxyAutoConfiguration {
 
 	@Bean
-	public OAuth2TokenFilter cloudfoundryTokenFilter() {
-		return new OAuth2TokenFilter();
+	public OAuth2TokenRelayFilter oauth2TokenRelayFilter() {
+		return new OAuth2TokenRelayFilter();
 	}
 
 }
diff --git a/src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2TokenFilter.java b/src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2TokenRelayFilter.java
similarity index 96%
rename from src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2TokenFilter.java
rename to src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2TokenRelayFilter.java
index 973018e..bb01468 100644
--- a/src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2TokenFilter.java
+++ b/src/main/java/org/springframework/cloud/cloudfoundry/proxy/OAuth2TokenRelayFilter.java
@@ -8,7 +8,7 @@ import org.springframework.security.oauth2.provider.authentication.OAuth2Authent
 import com.netflix.zuul.ZuulFilter;
 import com.netflix.zuul.context.RequestContext;
 
-public class OAuth2TokenFilter extends ZuulFilter {
+public class OAuth2TokenRelayFilter extends ZuulFilter {
 
 	private static final String ACCESS_TOKEN = "ACCESS_TOKEN";
 
diff --git a/src/main/java/org/springframework/cloud/cloudfoundry/sso/EnableCloudfoundrySso.java b/src/main/java/org/springframework/cloud/cloudfoundry/sso/EnableCloudfoundrySso.java
deleted file mode 100644
index 0c62cc4..0000000
--- a/src/main/java/org/springframework/cloud/cloudfoundry/sso/EnableCloudfoundrySso.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.cloud.cloudfoundry.sso;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author Dave Syer
- *
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@EnableOAuth2Sso
-public @interface EnableCloudfoundrySso {
-
-}