diff --git a/src/install/arch-specific/sinixz/prototype.in b/src/install/arch-specific/sinixz/prototype.in
index 83aae21ae1..1cbe308cbc 100644
--- a/src/install/arch-specific/sinixz/prototype.in
+++ b/src/install/arch-specific/sinixz/prototype.in
@@ -1,4 +1,4 @@
-# $Id: prototype.in,v 1.10 2003-02-10 11:00:46 eku Exp $
+# $Id: prototype.in,v 1.11 2003-02-10 11:48:25 dimitr Exp $
 #-------------------------------------------------------------------------------
 
 !SRCDIR=@NEW_FIREBIRD_DIR@
@@ -15,7 +15,7 @@ d none  /usr/lib     ? ? ?
 
 d none @prefix@ 0755 root root
 
-f none @prefix@/security.gdb=$SRCDIR/security.gdb  0666 root root
+f none @prefix@/security.gdb=$SRCDIR/security.fdb  0666 root root
 f none @prefix@/firebird.msg=$SRCDIR/firebird.msg  0644 root root
 f none @prefix@/de_DE.msg=$SRCDIR/de_DE.msg  0644 root root
 f none @prefix@/fr_FR.msg=$SRCDIR/fr_FR.msg  0644 root root
diff --git a/src/jrd/alt_use_sec.h b/src/jrd/alt_use_sec.h
index 6c1a945539..56e999975f 100644
--- a/src/jrd/alt_use_sec.h
+++ b/src/jrd/alt_use_sec.h
@@ -29,13 +29,13 @@
  *       John Bellardo  <bellardo@cs.ucsd.edu>
  *
  *
- *  $Id: alt_use_sec.h,v 1.10 2003-02-10 11:00:51 eku Exp $
+ *  $Id: alt_use_sec.h,v 1.11 2003-02-10 11:48:22 dimitr Exp $
  *
  */
 
 
-// During the build process in the initial stages the security.gdb database
-// does not exist, but to build the security.gdb database the tools need to
+// During the build process in the initial stages the security.fdb database
+// does not exist, but to build the security.fdb database the tools need to
 // be built. So the following #define is set/unset in the makefile depending
 // upon which stage in the compile process we are up to.
 //
diff --git a/src/jrd/svc.cpp b/src/jrd/svc.cpp
index 683b73ec6c..a656719a3d 100644
--- a/src/jrd/svc.cpp
+++ b/src/jrd/svc.cpp
@@ -1228,7 +1228,7 @@ void SVC_putc(SVC service, UCHAR ch)
 
 
 		case isc_info_svc_user_dbpath:
-			/* The path to the user security database (security.gdb) */
+			/* The path to the user security database (security.fdb) */
 			SecurityDatabase::getPath(buffer);
 
 			if (!(info = INF_put_item(item, strlen(buffer), buffer,
@@ -1732,7 +1732,7 @@ void SVC_query(SVC		service,
 
 
 		case isc_info_svc_user_dbpath:
-			/* The path to the user security database (security.gdb) */
+			/* The path to the user security database (security.fdb) */
 			SecurityDatabase::getPath(reinterpret_cast<char*>(buffer));
 
 			if (!(info = INF_put_item(item,
diff --git a/src/remote/inet_server.cpp b/src/remote/inet_server.cpp
index 60dc5c2fc0..f8aed61c85 100644
--- a/src/remote/inet_server.cpp
+++ b/src/remote/inet_server.cpp
@@ -32,7 +32,7 @@
  *
  */
 /*
-$Id: inet_server.cpp,v 1.20 2003-02-10 11:01:10 eku Exp $
+$Id: inet_server.cpp,v 1.21 2003-02-10 11:48:24 dimitr Exp $
 */
 #include "firebird.h"
 #include "../jrd/ib_stdio.h"
@@ -417,7 +417,7 @@ int CLIB_ROUTINE main( int argc, char **argv)
 		gds__log(err_buf);
 	}
 
-/* Server tries to attash to security.gdb to make sure everything is OK
+/* Server tries to attash to security.fdb to make sure everything is OK
    This code fixes bug# 8429 + all other bug of that kind - from 
    now on the server exits if it cannot attach to the database
    (wrong or no license, not enough memory, etc.
diff --git a/src/utilities/ibmgr.h b/src/utilities/ibmgr.h
index bc2da413f2..7535c7c072 100644
--- a/src/utilities/ibmgr.h
+++ b/src/utilities/ibmgr.h
@@ -19,7 +19,7 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
- * $Id: ibmgr.h,v 1.3 2003-02-10 11:01:21 eku Exp $
+ * $Id: ibmgr.h,v 1.4 2003-02-10 11:48:23 dimitr Exp $
  */
 
 #ifndef _UTILITIES_IBMGR_H_
@@ -36,8 +36,8 @@
 #define FIREBIRD_USER_NAME	"firebird"
 #define INTERBASE_USER_NAME	"interbase"
 #define INTERBASE_USER_SHORT	"interbas"
-#define SERVER_GUARDIAN		"bin/ibguard"
-#define USER_INFO_NAME		"security.gdb"
+#define SERVER_GUARDIAN		"bin/fbguard"
+#define USER_INFO_NAME		"security.fdb"
 
 #define MSG_FAC		18
 #define MSG_LEN		128
diff --git a/src/utilities/security.epp b/src/utilities/security.epp
index 98784f8b1a..4ef1f4b038 100644
--- a/src/utilities/security.epp
+++ b/src/utilities/security.epp
@@ -34,7 +34,7 @@
 #include "../utilities/gsec.h"
 #include "../utilities/secur_proto.h"
 
-DATABASE DB = STATIC FILENAME "security.gdb";
+DATABASE DB = STATIC FILENAME "security.fdb";
 
 #define MAX_PASSWORD_LENGTH	31
 #define SYSDBA_USER_NAME	"SYSDBA"
@@ -373,7 +373,7 @@ void SECURITY_get_db_path( TEXT * server, TEXT * buffer)
    are unable to get the path from server
 */
 
-/* to get rid of these "security.gdb not found" messges add 
+/* to get rid of these "security.fdb not found" messges add 
    the path to USER_INFO NAME FSG june 30 2001 */
 
 #if (defined VMS || defined WIN_NT || defined LINUX || defined SINIXZ || defined SUPERSERVER)