diff --git a/libsrc/Makefile b/libsrc/Makefile
index ea16e0736..eb1e948fc 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -50,10 +50,10 @@ apple2lib:
 	    $(AR) a apple2.lib $$i/*.o;\
 	done
 	mv apple2/crt0.o apple2.o
-	cp apple2/apple2-lc.emd a2-lc.emd
-	cp apple2/apple2-280-192-6.tgi a2-hi.tgi
-	cp apple2/apple2-40-40-16.tgi a2-lo.tgi
-	cp apple2/apple2-stdjoy.joy a2-stdjoy.joy
+	cp apple2/apple2-lc.emd a2.lc.emd
+	cp apple2/apple2-280-192-6.tgi a2.hi.tgi
+	cp apple2/apple2-40-40-16.tgi a2.lo.tgi
+	cp apple2/apple2-stdjoy.joy a2.stdjoy.joy
 
 #-----------------------------------------------------------------------------
 # Atari
diff --git a/libsrc/apple2/tgi_mode_table.s b/libsrc/apple2/tgi_mode_table.s
index f4ec70923..00bd0ecc4 100644
--- a/libsrc/apple2/tgi_mode_table.s
+++ b/libsrc/apple2/tgi_mode_table.s
@@ -17,7 +17,7 @@
 .rodata
 
 _tgi_mode_table:
-	.byte   TGI_MODE_280_192_6, "A2-HI.TGI", 0
-	.byte   TGI_MODE_40_40_16,  "A2-LO.TGI", 0
-;	.byte   TGI_MODE_560_192_2, "A2-DHI.TGI", 0
+	.byte   TGI_MODE_280_192_6, "A2.HI.TGI", 0
+	.byte   TGI_MODE_40_40_16,  "A2.LO.TGI", 0
+;	.byte   TGI_MODE_560_192_2, "A2.DHI.TGI", 0
 	.byte   0       ; End marker
diff --git a/packages/rpm/redhat/cc65.spec b/packages/rpm/redhat/cc65.spec
index dc76765fc..5bca22d2d 100644
--- a/packages/rpm/redhat/cc65.spec
+++ b/packages/rpm/redhat/cc65.spec
@@ -109,9 +109,9 @@ programs for the Apple ][ using the cc65 crosscompiler.
 %files apple2
 %attr(644,root,root) 		/usr/lib/cc65/lib/apple2.lib
 %attr(644,root,root) 		/usr/lib/cc65/lib/apple2.o
-%attr(644,root,root) 		/usr/lib/cc65/emd/a2-*.emd
-%attr(644,root,root) 		/usr/lib/cc65/joy/a2-*.joy
-%attr(644,root,root) 		/usr/lib/cc65/tgi/a2-*.tgi
+%attr(644,root,root) 		/usr/lib/cc65/emd/a2.*.emd
+%attr(644,root,root) 		/usr/lib/cc65/joy/a2.*.joy
+%attr(644,root,root) 		/usr/lib/cc65/tgi/a2.*.tgi