diff --git a/api/v1alpha1/accesstoken_types.go b/api/v1alpha1/accesstoken_types.go
index 2680501..0db5793 100644
--- a/api/v1alpha1/accesstoken_types.go
+++ b/api/v1alpha1/accesstoken_types.go
@@ -97,6 +97,10 @@ type AccessTokenList struct {
 	Items           []AccessToken `json:"items"`
 }
 
+func (at AccessToken) LocalName() string {
+	return at.Namespace + "/" + at.Name
+}
+
 func init() {
 	SchemeBuilder.Register(&AccessToken{}, &AccessTokenList{})
 }
diff --git a/pkg/auth/authenticator.go b/pkg/auth/authenticator.go
index d0c11ae..93e1b81 100644
--- a/pkg/auth/authenticator.go
+++ b/pkg/auth/authenticator.go
@@ -58,6 +58,7 @@ const (
 	CerberusHeaderTokenPriority         CerberusHeaderName = "X-Cerberus-Token-Priority"
 	CerberusHeaderWebServiceMinPriority CerberusHeaderName = "X-Cerberus-Webservice-Min-Priority"
 	CerberusHeaderAccessToken           CerberusHeaderName = "X-Cerberus-AccessToken"
+	CerberusHeaderWebservice            CerberusHeaderName = "X-Cerberus-Webservice"
 )
 
 // Access limit reasons
@@ -92,7 +93,8 @@ func (a *Authenticator) TestAccess(request *Request, wsvc WebservicesCacheEntry)
 		return
 	}
 
-	newExtraHeaders.set(CerberusHeaderAccessToken, ac.ObjectMeta.Name)
+	newExtraHeaders.set(CerberusHeaderAccessToken, ac.LocalName())
+	newExtraHeaders.set(CerberusHeaderWebservice, wsvc.LocalName())
 
 	for _, validator := range a.validators {
 		var headers CerberusExtraHeaders
diff --git a/pkg/auth/authenticator_test.go b/pkg/auth/authenticator_test.go
index 1603c9b..5eb7c09 100644
--- a/pkg/auth/authenticator_test.go
+++ b/pkg/auth/authenticator_test.go
@@ -203,11 +203,12 @@ func TestTestAccessValidToken(t *testing.T) {
 	tokenEntry := AccessTokensCacheEntry{
 		AccessToken: cerberusv1alpha1.AccessToken{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "valid-token",
+				Name:      "valid-token",
+				Namespace: "SampleNamespace",
 			},
 		},
 		allowedWebservicesCache: map[string]struct{}{
-			"SampleWebService": {},
+			"SampleNamespace/SampleWebService": {},
 		},
 	}
 	(*authenticator.accessTokensCache)["valid-token"] = tokenEntry
@@ -218,6 +219,7 @@ func TestTestAccessValidToken(t *testing.T) {
 	request := &Request{
 		Context: map[string]string{
 			"webservice": "SampleWebService",
+			"namespace":  "SampleNamespace",
 		},
 		Request: http.Request{
 			Header: headers,
@@ -227,7 +229,8 @@ func TestTestAccessValidToken(t *testing.T) {
 	webservice := WebservicesCacheEntry{
 		WebService: cerberusv1alpha1.WebService{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "SampleWebService",
+				Name:      "SampleWebService",
+				Namespace: "SampleNamespace",
 			},
 			Spec: cerberusv1alpha1.WebServiceSpec{
 				LookupHeader: string(CerberusHeaderAccessToken),
@@ -239,7 +242,8 @@ func TestTestAccessValidToken(t *testing.T) {
 	reason, extraHeaders := authenticator.TestAccess(request, webservice)
 
 	assert.Equal(t, CerberusReasonNotSet, reason, "Expected reason to be OK")
-	assert.Equal(t, "valid-token", extraHeaders[CerberusHeaderAccessToken], "Expected token in extraHeaders")
+	assert.Equal(t, "SampleNamespace/valid-token", extraHeaders[CerberusHeaderAccessToken], "Expected token in extraHeaders")
+	assert.Equal(t, "SampleNamespace/SampleWebService", extraHeaders[CerberusHeaderWebservice], "Expected webservice in extraHeader")
 }
 
 func TestTestAccessInvalidToken(t *testing.T) {
@@ -328,7 +332,8 @@ func TestTestAccessBadIPList(t *testing.T) {
 	tokenEntry := AccessTokensCacheEntry{
 		AccessToken: cerberusv1alpha1.AccessToken{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "valid-token",
+				Name:      "valid-token",
+				Namespace: "SampleNamespace",
 			},
 			Spec: cerberusv1alpha1.AccessTokenSpec{
 				AllowedIPs: []string{"192.168.1.1", "192.168.1.2"},
@@ -358,7 +363,8 @@ func TestTestAccessBadIPList(t *testing.T) {
 	webservice := WebservicesCacheEntry{
 		WebService: cerberusv1alpha1.WebService{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: "SampleWebService",
+				Name:      "SampleWebService",
+				Namespace: "SampleNamespace",
 			},
 			Spec: cerberusv1alpha1.WebServiceSpec{
 				LookupHeader: string(CerberusHeaderAccessToken),
@@ -366,12 +372,13 @@ func TestTestAccessBadIPList(t *testing.T) {
 		},
 	}
 
-	(*authenticator.webservicesCache)["SampleWebService"] = webservice
+	(*authenticator.webservicesCache)["SampleNamespace/SampleWebService"] = webservice
 
 	reason, extraHeaders := authenticator.TestAccess(request, webservice)
 
 	assert.Equal(t, CerberusReasonBadIpList, reason, "Expected reason to be BadIpList")
-	assert.Equal(t, extraHeaders[CerberusHeaderAccessToken], "valid-token", "Expected AccessToken Name as a Header")
+	assert.Equal(t, extraHeaders[CerberusHeaderAccessToken], "SampleNamespace/valid-token", "Expected AccessToken LocalName as a Header")
+	assert.Equal(t, extraHeaders[CerberusHeaderWebservice], "SampleNamespace/SampleWebService", "Expected Webservice LocalName as a Header")
 }
 
 func TestTestAccessLimited(t *testing.T) {