Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision f32d90be790669d71082aea8e9d0e239043b61e7)
+++ HelenOS.config	(revision 70554dddbb6288c84c93b2b9a9b684e7df443f3e)
@@ -61,6 +61,6 @@
 @ "pentium3" Pentium 3
 @ "core" Core Solo/Duo
-@ "athlon-xp" Athlon XP
-@ "athlon-mp" Athlon MP
+@ "athlon_xp" Athlon XP
+@ "athlon_mp" Athlon MP
 ! [PLATFORM=ia32] MACHINE (choice)
 
@@ -244,5 +244,5 @@
 
 % Fences
-! [PLATFORM=ia32&(MACHINE=athlon-xp|MACHINE=athlon-mp|MACHINE=pentium3)] CONFIG_FENCES_P3 (y)
+! [PLATFORM=ia32&(MACHINE=athlon_xp|MACHINE=athlon_mp|MACHINE=pentium3)] CONFIG_FENCES_P3 (y)
 
 % Fences
@@ -292,5 +292,5 @@
 
 % Support for SMP
-! [(PLATFORM=ia32&MACHINE!=athlon-xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)] CONFIG_SMP (y/n)
+! [(PLATFORM=ia32&MACHINE!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)] CONFIG_SMP (y/n)
 
 % Improved support for hyperthreading
@@ -298,5 +298,5 @@
 
 % Improved support for hyperthreading
-! [PLATFORM=ia32&MACHINE!=athlon-xp&MACHINE!=athlon-mp&MACHINE!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
+! [PLATFORM=ia32&MACHINE!=athlon_xp&MACHINE!=athlon_mp&MACHINE!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
 
 % Lazy FPU context switching
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision f32d90be790669d71082aea8e9d0e239043b61e7)
+++ kernel/arch/ia32/Makefile.inc	(revision 70554dddbb6288c84c93b2b9a9b684e7df443f3e)
@@ -46,9 +46,9 @@
 #
 
-ifeq ($(MACHINE),athlon-xp)
+ifeq ($(MACHINE),athlon_xp)
 	CMN2 = -march=athlon-xp
 	SUNCC_CFLAGS += -xarch=ssea
 endif
-ifeq ($(MACHINE),athlon-mp)
+ifeq ($(MACHINE),athlon_mp)
 	CMN2 = -march=athlon-mp
 	SUNCC_CFLAGS += xarch=ssea