diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
index cda49ffdeb..896cdcd288 100644
--- a/build/jam/HaikuPackages
+++ b/build/jam/HaikuPackages
@@ -355,10 +355,10 @@ CopyDirectoryToPackage documentation
 BuildHaikuPackage $(haikuPackage) : haiku ;
 
 
-#pragma mark - haiku-devel.hpkg
+#pragma mark - haiku_devel.hpkg
 
 
-local haikuDevelPackage = haiku-devel.hpkg ;
+local haikuDevelPackage = haiku_devel.hpkg ;
 HaikuPackage $(haikuDevelPackage) ;
 
 local arch = $(TARGET_ARCH) ;
@@ -435,13 +435,13 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
 		: [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 : -x .svn ;
 }
 
-BuildHaikuPackage $(haikuDevelPackage) : haiku-devel ;
+BuildHaikuPackage $(haikuDevelPackage) : haiku_devel ;
 
 
-#pragma mark - haiku-userguide.hpkg
+#pragma mark - haiku_userguide.hpkg
 
 
-local haikuUserGuidePackage = haiku-userguide.hpkg ;
+local haikuUserGuidePackage = haiku_userguide.hpkg ;
 HaikuPackage $(haikuUserGuidePackage) ;
 
 CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs userguide ]
@@ -449,13 +449,13 @@ CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs userguide ]
 SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToPackage bin : userguide ;
 
-BuildHaikuPackage $(haikuUserGuidePackage) : haiku-userguide ;
+BuildHaikuPackage $(haikuUserGuidePackage) : haiku_userguide ;
 
 
-#pragma mark - haiku-welcome.hpkg
+#pragma mark - haiku_welcome.hpkg
 
 
-local haikuWelcomePackage = haiku-welcome.hpkg ;
+local haikuWelcomePackage = haiku_welcome.hpkg ;
 HaikuPackage $(haikuWelcomePackage) ;
 
 CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ]
@@ -463,13 +463,13 @@ CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ]
 SEARCH on welcome = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToPackage bin : welcome ;
 
-BuildHaikuPackage $(haikuWelcomePackage) : haiku-welcome ;
+BuildHaikuPackage $(haikuWelcomePackage) : haiku_welcome ;
 
 
-#pragma mark - makefile-engine.hpkg
+#pragma mark - makefile_engine.hpkg
 
 
-local makefileEnginePackage = makefile-engine.hpkg ;
+local makefileEnginePackage = makefile_engine.hpkg ;
 HaikuPackage $(makefileEnginePackage) ;
 
 # skeleton makefile and makefile-engine
@@ -480,4 +480,4 @@ local makefileEngineFiles =
 SEARCH on $(makefileEngineFiles) = [ FDirName $(HAIKU_TOP) data develop ] ;
 AddFilesToPackage develop etc : $(makefileEngineFiles) ;
 
-BuildHaikuPackage $(makefileEnginePackage) : makefile-engine ;
+BuildHaikuPackage $(makefileEnginePackage) : makefile_engine ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index d31636966c..be28c41153 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -565,8 +565,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
 			$(HAIKU_GCC_VERSION[1]) ;
 	}
 
-	AddFilesToHaikuImage system packages : haiku-devel.hpkg ;
-	AddFilesToHaikuImage common packages : makefile-engine.hpkg ;
+	AddFilesToHaikuImage system packages : haiku_devel.hpkg ;
+	AddFilesToHaikuImage common packages : makefile_engine.hpkg ;
 }
 
 
@@ -1477,8 +1477,8 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
 
 # Welcome
 if [ IsOptionalHaikuImagePackageAdded Welcome ] {
-	AddFilesToHaikuImage system packages : haiku-userguide.hpkg ;
-	AddFilesToHaikuImage system packages : haiku-welcome.hpkg ;
+	AddFilesToHaikuImage system packages : haiku_userguide.hpkg ;
+	AddFilesToHaikuImage system packages : haiku_welcome.hpkg ;
 
 	AddSymlinkToHaikuImage home Desktop	: /boot/system/bin/welcome
 		: Welcome ;
diff --git a/src/data/package_infos/haiku b/src/data/package_infos/haiku
index c72c65d1fb..d9e60fd01e 100644
--- a/src/data/package_infos/haiku
+++ b/src/data/package_infos/haiku
@@ -1,5 +1,5 @@
 name 			haiku
-version			R1-alpha3_pm-1
+version			R1[alpha3_pm]-1
 architecture	x86_gcc2
 summary			"The Haiku base system"
 
@@ -16,7 +16,7 @@ licenses {
 }
 
 provides {
-	haiku=R1-alpha3_pm-1 compat>=R1-alpha1
+	haiku=R1[alpha3_pm]-1 compat>=R1[alpha1]
 	coreutils=8.4 compat>=0.0
 	diffutils=2.8.1 compat>=0.0
 	findutils=4.2.33 compat>=0.0
diff --git a/src/data/package_infos/haiku-devel b/src/data/package_infos/haiku_devel
similarity index 79%
rename from src/data/package_infos/haiku-devel
rename to src/data/package_infos/haiku_devel
index de21f9a864..f9a734b64f 100644
--- a/src/data/package_infos/haiku-devel
+++ b/src/data/package_infos/haiku_devel
@@ -1,5 +1,5 @@
-name			haiku-devel
-version			R1-alpha3_pm-1
+name			haiku_devel
+version			R1[alpha3_pm]-1
 architecture	x86_gcc2
 summary			"The Haiku base system development files"
 
@@ -14,9 +14,9 @@ copyrights		"2001-2011 Haiku, Inc. et al"
 licenses		"MIT"
 
 provides {
-	haiku-devel=R1-alpha3_pm-1
+	haiku_devel=R1[alpha3_pm]-1
 }
 
 requires {
-	haiku
+	haiku == R1[alpha3_pm]-1
 }
diff --git a/src/data/package_infos/haiku-userguide b/src/data/package_infos/haiku_userguide
similarity index 75%
rename from src/data/package_infos/haiku-userguide
rename to src/data/package_infos/haiku_userguide
index cfef5a6d25..2b0dd50927 100644
--- a/src/data/package_infos/haiku-userguide
+++ b/src/data/package_infos/haiku_userguide
@@ -1,5 +1,5 @@
-name			haiku-userguide
-version			R1-alpha3_pm-1
+name			haiku_userguide
+version			R1[alpha3_pm]-1
 architecture	any
 summary			"The Haiku user documentation"
 description		"The Haiku user documentation."
@@ -11,7 +11,7 @@ copyrights		"2001-2011 Haiku, Inc. et al"
 licenses		MIT
 
 provides {
-	haiku-userguide=R1-alpha3_pm-1
+	haiku_userguide=R1[alpha3_pm]-1
 }
 
 requires {
diff --git a/src/data/package_infos/haiku-welcome b/src/data/package_infos/haiku_welcome
similarity index 77%
rename from src/data/package_infos/haiku-welcome
rename to src/data/package_infos/haiku_welcome
index b5c349e233..cdbc2a33b9 100644
--- a/src/data/package_infos/haiku-welcome
+++ b/src/data/package_infos/haiku_welcome
@@ -1,5 +1,5 @@
-name			haiku-welcome
-version			R1-alpha3_pm-1
+name			haiku_welcome
+version			R1[alpha3_pm]-1
 architecture	any
 summary			"The Haiku welcome documentation"
 description		"The Haiku welcome documentation for new users."
@@ -11,7 +11,7 @@ copyrights		"2001-2011 Haiku, Inc. et al"
 licenses		"MIT"
 
 provides {
-	haiku-welcome=R1-alpha3_pm-1
+	haiku_welcome=R1[alpha3_pm]-1
 }
 
 requires {
diff --git a/src/data/package_infos/makefile-engine b/src/data/package_infos/makefile_engine
similarity index 77%
rename from src/data/package_infos/makefile-engine
rename to src/data/package_infos/makefile_engine
index 31387409a1..5f6238ddad 100644
--- a/src/data/package_infos/makefile-engine
+++ b/src/data/package_infos/makefile_engine
@@ -1,5 +1,5 @@
-name			makefile-engine
-version			R1-alpha3_pm-1
+name			makefile_engine
+version			R1[alpha3_pm]-1
 architecture	any
 summary			"The makefile engine"
 description 	"A simple generic makefile engine and makefile template."
@@ -11,7 +11,7 @@ copyrights		"? Be Inc. 2001-2011 Haiku, Inc."
 licenses		MIT
 
 provides {
-	makefile-engine=R1-alpha3_pm-1
+	makefile_engine=R1[alpha3_pm]-1
 }
 
 requires {