diff --git a/libsrc/atari/atari-stdjoy.s b/libsrc/atari/atari-stdjoy.s
index 597159ec4..b0f9c0cdd 100644
--- a/libsrc/atari/atari-stdjoy.s
+++ b/libsrc/atari/atari-stdjoy.s
@@ -1,5 +1,6 @@
 ;
-; Standard joystick driver for the Atari
+; Standard joystick driver for the Atari. May be used multiple times when linked
+; to the statically application.
 ;
 ; Ullrich von Bassewitz, 2002-12-21
 ; Using the readjoy code from Christian Groessler
@@ -38,7 +39,7 @@
 ; Jump table.
 
         .word   INSTALL
-        .word   DEINSTALL
+        .word   UNINSTALL
         .word   COUNT
         .word   READJOY
 
@@ -68,11 +69,11 @@ INSTALL:
 ;	rts                     ; Run into DEINSTALL instead
 
 ; ------------------------------------------------------------------------
-; DEINSTALL routine. Is called before the driver is removed from memory.
+; UNINSTALL routine. Is called before the driver is removed from memory.
 ; Can do cleanup or whatever. Must not return anything.
 ;
 
-DEINSTALL:
+UNINSTALL:
         rts
 
 
diff --git a/libsrc/c128/c128-stdjoy.s b/libsrc/c128/c128-stdjoy.s
index 811779a01..ba0018701 100644
--- a/libsrc/c128/c128-stdjoy.s
+++ b/libsrc/c128/c128-stdjoy.s
@@ -1,5 +1,7 @@
 ;
-; Standard joystick driver for the C128
+; Standard joystick driver for the C128. May be used multiple times when linked
+; to the statically application.
+
 ;
 ; Ullrich von Bassewitz, 2002-12-21
 ;
@@ -8,7 +10,7 @@
 
       	.include 	"joy-kernel.inc"
         .include        "joy-error.inc"
-        .include        "c128.inc"  
+        .include        "c128.inc"
 
         .macpack        generic
 
@@ -37,7 +39,7 @@
 ; Jump table.
 
         .word   INSTALL
-        .word   DEINSTALL
+        .word   UNINSTALL
         .word   COUNT
         .word   READ
 
@@ -67,11 +69,11 @@ INSTALL:
 ;	rts                     ; Run into DEINSTALL instead
 
 ; ------------------------------------------------------------------------
-; DEINSTALL routine. Is called before the driver is removed from memory.
+; UNINSTALL routine. Is called before the driver is removed from memory.
 ; Can do cleanup or whatever. Must not return anything.
 ;
 
-DEINSTALL:
+UNINSTALL:
         rts
 
 
diff --git a/libsrc/c16/c16-stdjoy.s b/libsrc/c16/c16-stdjoy.s
index 67816909b..506ebaa23 100644
--- a/libsrc/c16/c16-stdjoy.s
+++ b/libsrc/c16/c16-stdjoy.s
@@ -1,5 +1,6 @@
 ;
-; Standard joystick driver for the Plus/4
+; Standard joystick driver for the C16. May be used multiple times when linked
+; to the statically application.
 ;
 ; Ullrich von Bassewitz, 2002-12-21
 ;
diff --git a/libsrc/geos/devel/geos-stdjoy.s b/libsrc/geos/devel/geos-stdjoy.s
index b16149545..56fb3179c 100644
--- a/libsrc/geos/devel/geos-stdjoy.s
+++ b/libsrc/geos/devel/geos-stdjoy.s
@@ -1,5 +1,6 @@
 ;
-; Standard joystick driver for the C64
+; Standard joystick driver for the C64. May be used multiple times when linked
+; to the statically application.
 ;
 ; Ullrich von Bassewitz, 2002-12-20
 ;
@@ -37,7 +38,7 @@
 ; Jump table.
 
         .word   INSTALL
-        .word   DEINSTALL
+        .word   UNINSTALL
         .word   COUNT
         .word   READ
 
@@ -67,11 +68,11 @@ INSTALL:
 ;	rts                     ; Run into DEINSTALL instead
 
 ; ------------------------------------------------------------------------
-; DEINSTALL routine. Is called before the driver is removed from memory.
+; UNINSTALL routine. Is called before the driver is removed from memory.
 ; Can do cleanup or whatever. Must not return anything.
 ;
 
-DEINSTALL:
+UNINSTALL:
         rts
 
 
@@ -89,18 +90,18 @@ COUNT:
 ;
 
 READ:	php
-     	sei			; disable IRQ
+     	sei	  		; disable IRQ
 	lda	$01
 	pha
 	lda	#$35
 	sta	$01		; enable I/O
 
-	tax			; Joystick number into X
+	tax	  		; Joystick number into X
 	bne    	joy2
 
 ; Read joystick 1
 
-joy1:	
+joy1:
 	lda	#$7F
      	sta	cia1base
      	lda	cia1base+1
diff --git a/libsrc/plus4/plus4-stdjoy.s b/libsrc/plus4/plus4-stdjoy.s
index 5011397d4..ed5af58eb 100644
--- a/libsrc/plus4/plus4-stdjoy.s
+++ b/libsrc/plus4/plus4-stdjoy.s
@@ -1,5 +1,6 @@
 ;
-; Standard joystick driver for the Plus/4
+; Standard joystick driver for the Plus/4. May be used multiple times when linked
+; to the statically application.
 ;
 ; Ullrich von Bassewitz, 2002-12-21
 ;
@@ -37,12 +38,12 @@
 ; Jump table.
 
         .word   INSTALL
-        .word   DEINSTALL
+        .word   UNINSTALL
         .word   COUNT
         .word   READ
 
 ; ------------------------------------------------------------------------
-; Constants
+; Constants                     
 
 JOY_COUNT       = 2             ; Number of joysticks we support
 
@@ -67,11 +68,11 @@ INSTALL:
 ;	rts                     ; Run into DEINSTALL instead
 
 ; ------------------------------------------------------------------------
-; DEINSTALL routine. Is called before the driver is removed from memory.
+; UNINSTALL routine. Is called before the driver is removed from memory.
 ; Can do cleanup or whatever. Must not return anything.
 ;
 
-DEINSTALL:
+UNINSTALL:
         rts
 
 
diff --git a/libsrc/vic20/vic20-stdjoy.s b/libsrc/vic20/vic20-stdjoy.s
index 6d725a702..313f69410 100644
--- a/libsrc/vic20/vic20-stdjoy.s
+++ b/libsrc/vic20/vic20-stdjoy.s
@@ -1,5 +1,6 @@
 ;
-; Standard joystick driver for the VIC20
+; Standard joystick driver for the VIC20. May be used multiple times when linked
+; to the statically application.
 ;
 ; Ullrich von Bassewitz, 2002-12-20
 ; Using code from Steve Schmidtke
@@ -38,7 +39,7 @@
 ; Jump table.
 
         .word   INSTALL
-        .word   DEINSTALL
+        .word   UNINSTALL
         .word   COUNT
         .word   READ
 
@@ -68,11 +69,11 @@ INSTALL:
 ;	rts                     ; Run into DEINSTALL instead
 
 ; ------------------------------------------------------------------------
-; DEINSTALL routine. Is called before the driver is removed from memory.
+; UNINSTALL routine. Is called before the driver is removed from memory.
 ; Can do cleanup or whatever. Must not return anything.
 ;
 
-DEINSTALL:
+UNINSTALL:
         rts