diff --git a/src/db/Makefile.Vx b/src/db/Makefile.Vx
index fb4df6497..dc2cb9c8d 100644
--- a/src/db/Makefile.Vx
+++ b/src/db/Makefile.Vx
@@ -42,7 +42,7 @@ SRCS.c = \
 	../callback.c\
 	../taskwd.c \
 	../dbCa.c\
-	../dbcal.c\
+	../dbcar.c\
 	../devLib.c\
 	../initHooks.c
 
@@ -64,7 +64,7 @@ LIBOBJS = \
 	callback.o\
 	taskwd.o\
 	dbCa.o \
-	dbcal.o \
+	dbcar.o \
 	devLib.o
 
 PROD = initHooks.o
diff --git a/src/db/dbAccess.h b/src/db/dbAccess.h
index 87fe1f212..de56de5ce 100644
--- a/src/db/dbAccess.h
+++ b/src/db/dbAccess.h
@@ -270,6 +270,7 @@ struct dbr_alDouble     {DBRalDouble};
 struct rset *dbGetRset(struct dbAddr *paddr);
 int dbIsValueField(struct dbFldDes *pdbFldDes);
 int dbGetFieldIndex(struct dbAddr *paddr);
+long dbScanLink(struct dbCommon *pfrom, struct dbCommon *pto);
 long dbScanPassive(struct dbCommon *pfrom,struct dbCommon *pto);
 long dbProcess(struct dbCommon *precord);
 long dbNameToAddr(char *pname,struct dbAddr *);
@@ -298,12 +299,12 @@ long dbCaGetLink(struct link *plink,short dbrType,void *pbuffer,
 	unsigned short *psevr,long *nRequest);
 long dbCaPutLink(struct link *plink,short dbrType,void *pbuffer,long nRequest);
 
-long dbScanLink(struct dbCommon *pfrom, struct dbCommon *pto);
 #else
 struct rset *dbGetRset();
 int dbIsValueField();
 int dbGetFieldIndex();
 long dbScanPassive();
+long dbScanLink();
 long dbProcess();
 long dbNameToAddr();
 long dbGetLinkValue();
@@ -323,7 +324,6 @@ void dbCaAddLink();
 void dbCaRemoveLink();
 long dbCaGetLink();
 long dbCaPutLink();
-long dbScanLink();
 #endif /*__STDC__*/
 
 #endif /*INCdbAccessh*/
diff --git a/src/db/dbLock.c b/src/db/dbLock.c
index 6da857648..436df784a 100644
--- a/src/db/dbLock.c
+++ b/src/db/dbLock.c
@@ -54,7 +54,7 @@ Each problem above is solved as follows:
 Note that all other tasks are prevented from processing records between
 dbLockSetGblLock and dbLockSetGblUnlock. 
 
-dblls may crash if executed while lock sets are being modified.
+dblsr may crash if executed while lock sets are being modified.
 It is NOT a good idea to make it more robust by issuing dbLockSetGblLock
 since this will delay all other tasks.
 *****************************************************************************/
@@ -411,7 +411,7 @@ void dbLockSetSplit(dbCommon *psource)
 }
 
 extern struct dbBase *pdbbase;
-long dblls(char *recordname,int level)
+long dblsr(char *recordname,int level)
 {
     int			link;
     DBENTRY		dbentry;
diff --git a/src/db/dbLock.h b/src/db/dbLock.h
index 4574b6806..aab674a24 100644
--- a/src/db/dbLock.h
+++ b/src/db/dbLock.h
@@ -29,7 +29,7 @@ void dbLockSetGblLock(void);
 void dbLockSetGblUnlock(void);
 void dbLockSetRecordLock(struct dbCommon *precord);
 
-long dblls(char *recordname,int level);       /*list all records in same lock set*/
+long dblsr(char *recordname,int level);/*Lock Set Report */
 /* If recordname NULL then all records*/
 /* level = (0,1,2) (lock set state, + recordname, +DB links) */
 
diff --git a/src/db/dbcal.c b/src/db/dbcar.c
similarity index 98%
rename from src/db/dbcal.c
rename to src/db/dbcar.c
index cd2de2162..52dc6fd0b 100644
--- a/src/db/dbcal.c
+++ b/src/db/dbcar.c
@@ -1,4 +1,4 @@
-/* dbcal.c */
+/* dbcar.c */
 /*****************************************************************
                           COPYRIGHT NOTIFICATION
 *****************************************************************
@@ -44,7 +44,7 @@ of this distribution.
 #include "dbCa.h"
 extern struct dbBase *pdbbase;
 
-long dbcal(char	*precordname,int level)
+long dbcar(char	*precordname,int level)
 {
     DBENTRY		dbentry;
     DBENTRY		*pdbentry=&dbentry;
diff --git a/src/db/initHooks.c b/src/db/initHooks.c
index 7a3988cab..3e493a3e8 100644
--- a/src/db/initHooks.c
+++ b/src/db/initHooks.c
@@ -61,7 +61,7 @@ int	callNumber;
 	    break;
 	case INITHOOKafterCallbackInit :
 	    break;
-	case INITHOOKafterCaLinkInit1 :
+	case INITHOOKafterCaLinkInit :
 	    break;
 	case INITHOOKafterInitDrvSup :
 	    break;
diff --git a/src/db/initHooks.h b/src/db/initHooks.h
index 43eb4e2f1..3ad598bcb 100644
--- a/src/db/initHooks.h
+++ b/src/db/initHooks.h
@@ -39,7 +39,7 @@
 #define INITHOOKafterGetResources	1
 #define INITHOOKafterLogInit		2
 #define INITHOOKafterCallbackInit	3
-#define INITHOOKafterCaLinkInit1	4
+#define INITHOOKafterCaLinkInit		4
 #define INITHOOKafterInitDrvSup		5
 #define INITHOOKafterInitRecSup		6
 #define INITHOOKafterInitDevSup		7
diff --git a/src/db/iocInit.c b/src/db/iocInit.c
index dc9106897..72263283f 100644
--- a/src/db/iocInit.c
+++ b/src/db/iocInit.c
@@ -182,7 +182,7 @@ int iocInit(char * pResourceFilename)
 
    /* Initialize Channel Access Link mechanism.  */
     dbCaLinkInit();
-    if (pinitHooks) (*pinitHooks)(INITHOOKafterCaLinkInit1);
+    if (pinitHooks) (*pinitHooks)(INITHOOKafterCaLinkInit);
 
     if (initDrvSup() != 0)
          logMsg("iocInit: Drivers Failed during Initialization\n",0,0,0,0,0,0);
diff --git a/src/dbStatic/dbStaticLib.c b/src/dbStatic/dbStaticLib.c
index 6214dbd21..f34a774af 100644
--- a/src/dbStatic/dbStaticLib.c
+++ b/src/dbStatic/dbStaticLib.c
@@ -2157,7 +2157,7 @@ char  **dbGetFormValue(DBENTRY *pdbentry)
 	if(plink->value.constantStr) {
 	    strcpy(*value,plink->value.constantStr);
 	} else {
-	    *value = 0;
+	    strcpy(*value,"");
 	}
 	break;
     case PV_LINK: {