diff --git a/SoObjects/SOGo/SOGoAuthenticator.h b/SoObjects/SOGo/SOGoDAVAuthenticator.h
similarity index 77%
rename from SoObjects/SOGo/SOGoAuthenticator.h
rename to SoObjects/SOGo/SOGoDAVAuthenticator.h
index 6f8cd5feb..21e06a8af 100644
--- a/SoObjects/SOGo/SOGoAuthenticator.h
+++ b/SoObjects/SOGo/SOGoDAVAuthenticator.h
@@ -19,13 +19,15 @@
   02111-1307, USA.
 */
 
-#ifndef __Main_SOGoAuthenticator_H__
-#define __Main_SOGoAuthenticator_H__
+#ifndef __Main_SOGoDAVAuthenticator_H__
+#define __Main_SOGoDAVAuthenticator_H__
 
-#include <NGObjWeb/SoHTTPAuthenticator.h>
+#import <NGObjWeb/SoHTTPAuthenticator.h>
+
+#import "SOGoAuthenticator.h"
 
 /*
-  SOGoAuthenticator
+  SOGoDAVAuthenticator
   
   This just overrides the login/pwd check method and always returns YES since
   the password is already checked in Apache.
@@ -36,16 +38,16 @@
 
 @class SOGoUser;
 
-@interface SOGoAuthenticator : SoHTTPAuthenticator
+@interface SOGoDAVAuthenticator : SoHTTPAuthenticator <SOGoAuthenticator>
 {
   NSString *authMethod;
 }
 
-+ (id) sharedSOGoAuthenticator;
++ (id) sharedSOGoDAVAuthenticator;
 
 - (SOGoUser *) userInContext: (WOContext *) _ctx;
 - (NSString *) passwordInContext: (WOContext *) context;
 
 @end
 
-#endif /* __Main_SOGoAuthenticator_H__ */
+#endif /* __Main_SOGoDAVAuthenticator_H__ */
diff --git a/SoObjects/SOGo/SOGoAuthenticator.m b/SoObjects/SOGo/SOGoDAVAuthenticator.m
similarity index 95%
rename from SoObjects/SOGo/SOGoAuthenticator.m
rename to SoObjects/SOGo/SOGoDAVAuthenticator.m
index 20856a419..2380e672f 100644
--- a/SoObjects/SOGo/SOGoAuthenticator.m
+++ b/SoObjects/SOGo/SOGoDAVAuthenticator.m
@@ -31,13 +31,13 @@
 #import "SOGoPermissions.h"
 #import "SOGoUser.h"
 
-#import "SOGoAuthenticator.h"
+#import "SOGoDAVAuthenticator.h"
 
-@implementation SOGoAuthenticator
+@implementation SOGoDAVAuthenticator
 
-+ (id) sharedSOGoAuthenticator
++ (id) sharedSOGoDAVAuthenticator
 {
-  static SOGoAuthenticator *auth = nil;
+  static SOGoDAVAuthenticator *auth = nil;
  
   if (!auth)
     auth = [self new];
@@ -164,4 +164,4 @@
 //   return rc;
 // }
 
-@end /* SOGoAuthenticator */
+@end /* SOGoDAVAuthenticator */