diff --git a/token-checker-interface/src/main/protobuf/tokencheck.model.proto b/token-checker-interface/src/main/protobuf/tokencheck.model.proto
index 1c2dab13284752a5377a7ade10ab5ff1ea73a74b..b66bc759c6d33b31106dbb3bef67af60f19863f5 100644
--- a/token-checker-interface/src/main/protobuf/tokencheck.model.proto
+++ b/token-checker-interface/src/main/protobuf/tokencheck.model.proto
@@ -12,29 +12,23 @@ message GrpcCheckTokenRequest {
 
 message GrpcCheckTokenResponse {
   bool tokenValid = 1;
-  oneof checkTokenResults {
-    GrpcCheckTokenResult tokenCheckResult = 2;
+  oneof checkTokenResult {
+    GrpcTokenAttributes tokenAttributes = 2;
     GrpcCheckError checkError = 3;
   }
 }
 
-message GrpcCheckTokenResult {
+message GrpcTokenAttributes {
   string postfachId = 1;
   string trustLevel = 2;
-  repeated GrpcTokenAttribute otherFields = 3;
+  repeated GrpcOtherFields otherFields = 3;
 }
 
-message GrpcTokenAttribute {
+message GrpcOtherFields {
   string name = 1;
   string value = 2;
 }
 
 message GrpcCheckError {
   string message = 1;
-  repeated GrpcSamlError samlError = 2;
-}
-
-message GrpcSamlError {
-  string errorCode = 1;
-  string description = 2;
 }
\ No newline at end of file