diff --git a/libsrc/cbm610/cbm610.inc b/libsrc/cbm610/cbm610.inc
index 6520b7ecd..99fe2dc1e 100644
--- a/libsrc/cbm610/cbm610.inc
+++ b/libsrc/cbm610/cbm610.inc
@@ -24,7 +24,7 @@ SendHead  	= $24		; Head of send buffer
 SendTail  	= $25		; Tail of send buffer
 SendFreeCnt	= $26		; Number of bytes free in send buffer
 
-FNAM            := $90          ; File name address
+FNAM_ADR        := $90          ; File name address
 FNAM_SEG        := $92          ; Unused
 SaveAdrLow     	= $93
 SaveAdrHi      	= $94
diff --git a/libsrc/cbm610/ksetnam.s b/libsrc/cbm610/ksetnam.s
index 841b88358..47273fe95 100644
--- a/libsrc/cbm610/ksetnam.s
+++ b/libsrc/cbm610/ksetnam.s
@@ -14,9 +14,9 @@
 
 .proc   SETNAM
 
-        sta     FileNameLen
-        stx     FileNameAdrLo
-        sty     FileNameAdrHi
+        sta     FNAM_LEN
+        stx     FNAM_ADR 
+        sty     FNAM_ADR+1
         rts
 
 .endproc