diff -uNr openafs-1.2.13.orig/acinclude.m4 openafs-1.2.13/acinclude.m4
--- openafs-1.2.13.orig/acinclude.m4	2004-10-18 01:08:02.000000000 -0400
+++ openafs-1.2.13/acinclude.m4	2004-12-11 16:49:05.000000000 -0500
@@ -454,7 +454,7 @@
 			AFS_SYSNAME="ppc_linuxXX"
 			;;
 		alpha*-linux*)
-			AFS_SYSNAME="alpha_linux_XX"
+			AFS_SYSNAME="alpha_linuxXX"
 			;;
 		s390-*-linux*)
 			AFS_SYSNAME="s390_linuxXX"
diff -uNr openafs-1.2.13.orig/aclocal.m4 openafs-1.2.13/aclocal.m4
--- openafs-1.2.13.orig/aclocal.m4	2004-10-28 23:09:03.000000000 -0400
+++ openafs-1.2.13/aclocal.m4	2004-12-11 16:49:13.000000000 -0500
@@ -466,7 +466,7 @@
 			AFS_SYSNAME="ppc_linuxXX"
 			;;
 		alpha*-linux*)
-			AFS_SYSNAME="alpha_linux_XX"
+			AFS_SYSNAME="alpha_linuxXX"
 			;;
 		s390-*-linux*)
 			AFS_SYSNAME="s390_linuxXX"
diff -uNr openafs-1.2.13.orig/configure openafs-1.2.13/configure
--- openafs-1.2.13.orig/configure	2004-10-28 23:09:04.000000000 -0400
+++ openafs-1.2.13/configure	2004-12-11 16:49:24.000000000 -0500
@@ -3657,7 +3657,7 @@
 			AFS_SYSNAME="ppc_linuxXX"
 			;;
 		alpha*-linux*)
-			AFS_SYSNAME="alpha_linux_XX"
+			AFS_SYSNAME="alpha_linuxXX"
 			;;
 		s390-*-linux*)
 			AFS_SYSNAME="s390_linuxXX"
diff -uNr openafs-1.2.13.orig/configure-libafs openafs-1.2.13/configure-libafs
--- openafs-1.2.13.orig/configure-libafs	2004-10-28 23:09:05.000000000 -0400
+++ openafs-1.2.13/configure-libafs	2004-12-11 16:49:36.000000000 -0500
@@ -3657,7 +3657,7 @@
 			AFS_SYSNAME="ppc_linuxXX"
 			;;
 		alpha*-linux*)
-			AFS_SYSNAME="alpha_linux_XX"
+			AFS_SYSNAME="alpha_linuxXX"
 			;;
 		s390-*-linux*)
 			AFS_SYSNAME="s390_linuxXX"
diff -uNr openafs-1.2.13.orig/debian/kern-sysname openafs-1.2.13/debian/kern-sysname
--- openafs-1.2.13.orig/debian/kern-sysname	2004-12-11 16:58:29.000000000 -0500
+++ openafs-1.2.13/debian/kern-sysname	2004-12-11 16:50:07.000000000 -0500
@@ -16,10 +16,10 @@
     alpha)
 	case $KVERS in
 	    2.2*)
-		echo alpha_linux_22
+		echo alpha_linux22
 		;;
 	    2.4*)
-		echo alpha_linux_24
+		echo alpha_linux24
 		;;
 	    esac
 ;;
diff -uNr openafs-1.2.13.orig/debian/sysname openafs-1.2.13/debian/sysname
--- openafs-1.2.13.orig/debian/sysname	2004-12-11 16:58:29.000000000 -0500
+++ openafs-1.2.13/debian/sysname	2004-12-11 16:51:33.000000000 -0500
@@ -1,7 +1,7 @@
 #!/bin/sh
 case `arch` in
     alpha)
-	echo alpha_linux_22
+	echo alpha_linux22
 	;;
 i[3456]86)
 	echo i386_linux24
diff -uNr openafs-1.2.13.orig/src/config/afs_sysnames.h openafs-1.2.13/src/config/afs_sysnames.h
--- openafs-1.2.13.orig/src/config/afs_sysnames.h	2003-10-24 01:24:46.000000000 -0400
+++ openafs-1.2.13/src/config/afs_sysnames.h	2004-12-11 16:52:57.000000000 -0500
@@ -149,9 +149,9 @@
 #define SYS_NAME_ID_s390_linux22        1901
 #define SYS_NAME_ID_s390_linux24        1902
 
-#define SYS_NAME_ID_alpha_linux_2       2000
-#define SYS_NAME_ID_alpha_linux_22      2001
-#define SYS_NAME_ID_alpha_linux_24      2002
+#define SYS_NAME_ID_alpha_linux2        2000
+#define SYS_NAME_ID_alpha_linux22       2001
+#define SYS_NAME_ID_alpha_linux24       2002
 
 #define SYS_NAME_ID_i386_fbsd_42        2100
 #define SYS_NAME_ID_i386_fbsd_43        2101
diff -uNr openafs-1.2.13.orig/src/config/param.alpha_linux22.h openafs-1.2.13/src/config/param.alpha_linux22.h
--- openafs-1.2.13.orig/src/config/param.alpha_linux22.h	2002-07-10 16:42:34.000000000 -0400
+++ openafs-1.2.13/src/config/param.alpha_linux22.h	2004-12-11 16:53:44.000000000 -0500
@@ -1,5 +1,5 @@
-#ifndef _PARAM_ALPHA_LINUX2216_22_H_
-#define _PARAM_ALPHA_LINUX2216_22_H_
+#ifndef _PARAM_ALPHA_LINUX221622_H_
+#define _PARAM_ALPHA_LINUX221622_H_
 
 /* Linux 2.2.16 kernel on Alpha with glibc 2.2 */
  
@@ -54,8 +54,8 @@
 #define AFS_GCPAGS       2 /* Set to Userdisabled, allow sysctl to override */
 
 /* Machine / Operating system information */
-#define SYS_NAME       "alpha_linux_22"
-#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux_22
+#define SYS_NAME       "alpha_linux22"
+#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux22
 #define AFSLITTLE_ENDIAN    1
 #define AFS_HAVE_FFS        1       /* Use system's ffs. */
 #define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
@@ -70,4 +70,4 @@
 #endif
 #endif /* KERNEL */
 
-#endif /* _PARAM_ALPHA_LINUX2216_22_H_ */
+#endif /* _PARAM_ALPHA_LINUX221622_H_ */
diff -uNr openafs-1.2.13.orig/src/config/param.alpha_linux22_usr.h openafs-1.2.13/src/config/param.alpha_linux22_usr.h
--- openafs-1.2.13.orig/src/config/param.alpha_linux22_usr.h	2001-06-28 00:07:16.000000000 -0400
+++ openafs-1.2.13/src/config/param.alpha_linux22_usr.h	2004-12-11 16:54:16.000000000 -0500
@@ -1,5 +1,5 @@
-#ifndef _PARAM_ALPHA_LINUX2216_22_USR_H_
-#define _PARAM_ALPHA_LINUX2216_22_USR_H_
+#ifndef _PARAM_ALPHA_LINUX221622_USR_H_
+#define _PARAM_ALPHA_LINUX221622_USR_H_
 
 /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
  * it's a judgment call. If something is obviously sparc64 specific, use that
@@ -27,8 +27,8 @@
 
 
 /* Machine / Operating system information */
-#define SYS_NAME       "alpha_linux_22"
-#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux_22
+#define SYS_NAME       "alpha_linux22"
+#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux22
 #define AFSLITTLE_ENDIAN    1
 #define AFS_HAVE_FFS        1       /* Use system's ffs. */
 #define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
@@ -51,4 +51,4 @@
 #define CMSERVERPREF
 #endif
 
-#endif /* _PARAM_ALPHA_LINUX2216_22_USR_H_ */
+#endif /* _PARAM_ALPHA_LINUX221622_USR_H_ */
diff -uNr openafs-1.2.13.orig/src/config/param.alpha_linux24.h openafs-1.2.13/src/config/param.alpha_linux24.h
--- openafs-1.2.13.orig/src/config/param.alpha_linux24.h	2002-07-10 16:42:34.000000000 -0400
+++ openafs-1.2.13/src/config/param.alpha_linux24.h	2004-12-11 16:54:46.000000000 -0500
@@ -1,5 +1,5 @@
-#ifndef _PARAM_ALPHA_LINUX_24_H_
-#define _PARAM_ALPHA_LINUX_24_H_
+#ifndef _PARAM_ALPHA_LINUX24_H_
+#define _PARAM_ALPHA_LINUX24_H_
 
 /* Linux 2.2.16 kernel on Alpha with glibc 2.2 */
  
@@ -56,8 +56,8 @@
 #define AFS_GCPAGS       2 /* Set to Userdisabled, allow sysctl to override */
 
 /* Machine / Operating system information */
-#define SYS_NAME       "alpha_linux_24"
-#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux_24
+#define SYS_NAME       "alpha_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux24
 #define AFSLITTLE_ENDIAN    1
 #define AFS_HAVE_FFS        1       /* Use system's ffs. */
 #define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
@@ -72,4 +72,4 @@
 #endif
 #endif /* KERNEL */
 
-#endif /* _PARAM_ALPHA_LINUX_24_H_ */
+#endif /* _PARAM_ALPHA_LINUX24_H_ */
diff -uNr openafs-1.2.13.orig/src/config/param.alpha_linux24_usr.h openafs-1.2.13/src/config/param.alpha_linux24_usr.h
--- openafs-1.2.13.orig/src/config/param.alpha_linux24_usr.h	2001-10-13 00:36:14.000000000 -0400
+++ openafs-1.2.13/src/config/param.alpha_linux24_usr.h	2004-12-11 16:55:21.000000000 -0500
@@ -1,5 +1,5 @@
-#ifndef _PARAM_ALPHA_LINUX_24_USR_H_
-#define _PARAM_ALPHA_LINUX_24_USR_H_
+#ifndef _PARAM_ALPHA_LINUX24_USR_H_
+#define _PARAM_ALPHA_LINUX24_USR_H_
 
 /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
  * it's a judgment call. If something is obviously sparc64 specific, use that
@@ -28,8 +28,8 @@
 
 
 /* Machine / Operating system information */
-#define SYS_NAME       "alpha_linux_24"
-#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux_24
+#define SYS_NAME       "alpha_linux24"
+#define SYS_NAME_ID    SYS_NAME_ID_alpha_linux24
 #define AFSLITTLE_ENDIAN    1
 #define AFS_HAVE_FFS        1       /* Use system's ffs. */
 #define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
@@ -52,4 +52,4 @@
 #define CMSERVERPREF
 #endif
 
-#endif /* _PARAM_ALPHA_LINUX_24_USR_H_ */
+#endif /* _PARAM_ALPHA_LINUX24_USR_H_ */
diff -uNr openafs-1.2.13.orig/src/libafs/MakefileProto.LINUX.in openafs-1.2.13/src/libafs/MakefileProto.LINUX.in
--- openafs-1.2.13.orig/src/libafs/MakefileProto.LINUX.in	2003-05-28 19:49:24.000000000 -0400
+++ openafs-1.2.13/src/libafs/MakefileProto.LINUX.in	2004-12-11 16:57:15.000000000 -0500
@@ -65,7 +65,7 @@
 <amd64_linux24>
 CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe -mcmodel=kernel
 DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
-<alpha_linux_22 alpha_linux_24>
+<alpha_linux22 alpha_linux24>
 CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe -mno-fp-regs -ffixed-8
 DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
 <s390_linux22 s390_linux24>
@@ -143,7 +143,7 @@
 	$(RM) -f asm-generic
 	ln -s ${LINUX_KERNEL_PATH}/include/asm-generic asm-generic
 	$(RM) -f asm
-<alpha_linux_22 alpha_linux_24>
+<alpha_linux22 alpha_linux24>
 	ln -s ${LINUX_KERNEL_PATH}/include/asm-alpha asm
 <i386_linux22 i386_linux24>
 	ln -s ${LINUX_KERNEL_PATH}/include/asm-i386 asm
