diff --git a/.gitignore b/.gitignore
index 358bae7..dea1646 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *.swp
-fix.delete.key
-fix.delete.key.dsk
+delkeyeraseleft
+delkeyeraseleft.dsk
 _FileInformation.txt
diff --git a/Makefile b/Makefile
index d42ded0..dda2cc7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
 #
 
 AC=java -jar AppleCommander-1.3.5-ac.jar
-SRC=fix.delete.key.s
-PGM=fix.delete.key
+SRC=delkeyeraseleft.s
+PGM=delkeyeraseleft
 VOL=$(PGM)
 DSK=$(PGM).dsk
 
diff --git a/TODO b/TODO
index 862d79c..55ba65e 100644
--- a/TODO
+++ b/TODO
@@ -4,3 +4,6 @@
 4. Don't change cursor. Keep whatever cursor exists at load time.
 5. Create program to detect if the handler is loaded: delkey.detect?.
 6. Add program to print explanation and instructions.
+7. Change subroutines to macros
+8. Implement a better test for 80-column mode, possibly check cursor; if is delete char then 40-column mode
+9. Add build and run instructions, explanation
diff --git a/fix.delete.key.s b/delkeyeraseleft.s
similarity index 96%
rename from fix.delete.key.s
rename to delkeyeraseleft.s
index 467030a..d394c33 100644
--- a/fix.delete.key.s
+++ b/delkeyeraseleft.s
@@ -9,7 +9,7 @@
 
                ORG   $300
                TYP   $06        	;BINARY TYPE
-               DSK   fix.delete.key	;PUT FILE NAME
+               DSK   delkeyeraseleft	;PUT FILE NAME
 
 CH             EQU   $24        ;HORIZ CHAR POS (40-COL)
 BASL           EQU   $28        ;BASE ADDR FOR CURR VIDEO LINE
@@ -84,7 +84,7 @@ PUTS           MAC
 
 ********************************
 *                              *
-* PUT80 MACRO                  *
+* PUTC80 MACRO                 *
 *                              *
 * IN 80-COL MODE EVEN COLUMNS  *
 * ARE IN AUXILIARY MEMORY      *
@@ -96,7 +96,7 @@ PUTS           MAC
 *                              *
 ********************************
 
-PUT80          MAC
+PUTC80         MAC
                TYA              ;MOVE Y TO A
                PHA              ;SAVE Y VALUE ON STACK
                SEI              ;DISABLE INTERRUPTS
@@ -163,7 +163,7 @@ COL40
                JMP   FINISH
 
 COL80
-               PUT80 #' ';OURCH ;DISPLAY OUR CURSOR, INVERSE SPC
+               PUTC80 #' ';OURCH ;DISPLAY OUR CURSOR, INVERSE SPC
 
 NEXTKEY
                JSR   GETKEY     ;LOAD "KEY" VARIABLE
@@ -178,7 +178,7 @@ NEXTKEY
                STA   KEY
 
 CLRCURS
-               PUT80 #" ";OURCH ;ERASE CURSOR
+               PUTC80 #" ";OURCH ;ERASE CURSOR
 
 FINISH
                PLA              ;RESTORE Y
@@ -222,7 +222,7 @@ D2BDONE
 *                              *
 ********************************
 
-LOADMSG        ASC   "LOADED DELETE HANDLER",0D,00
+LOADMSG        ASC   "LOADED DELETE KEY HANDLER",0D,00
 KEY            DB    0
 ORIGCURS       DB    0