diff --git a/Makefile b/Makefile
index 25dded5..1d2cde9 100644
--- a/Makefile
+++ b/Makefile
@@ -94,4 +94,4 @@ update-repo:
 
 iso:
 	ln -sf `pwd` /tmp/qubes-installer
-	revisor --cli --config=conf/qubes-install-respin.conf --model=qubes1-x86_64 --install-dvd
+	revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 --install-dvd
diff --git a/conf/comps-qubes1.xml b/conf/comps-qubes.xml
similarity index 100%
rename from conf/comps-qubes1.xml
rename to conf/comps-qubes.xml
diff --git a/conf/qubes-install-respin.conf b/conf/qubes-install.conf
similarity index 78%
rename from conf/qubes-install-respin.conf
rename to conf/qubes-install.conf
index d069e64..e657f80 100644
--- a/conf/qubes-install-respin.conf
+++ b/conf/qubes-install.conf
@@ -13,7 +13,7 @@ dependency_resolve_allow_conflicts = 0
 mode_respin = 1
 
 kickstart_manifest = 1
-kickstart_file = /tmp/qubes-installer/conf/qubes-1-respin.cfg
+kickstart_file = /tmp/qubes-installer/conf/qubes-kickstart.cfg
 kickstart_include = 0
 kickstart_default = 1
 
@@ -35,15 +35,15 @@ version = R1
 version_from = F13
 comps_filter = 0
 revisor_comps = 1
-comps = /tmp/qubes-installer/conf/comps-qubes1.xml
+comps = /tmp/qubes-installer/conf/comps-qubes.xml
 
 destination_directory = /tmp/qubes-installer/build/ISO
 working_directory = /tmp/qubes-installer/build/work
 
 ## Models
 
-[qubes1-x86_64]
-description = Qubes R1 for x86_64
-main = /tmp/qubes-installer/conf/qubes1-x86_64-respin.conf
+[qubes-x86_64]
+description = Qubes for x86_64
+main = /tmp/qubes-installer/conf/qubes-x86_64.conf
 iso_basename = Qubes
 architecture = x86_64
diff --git a/conf/qubes-1-respin.cfg b/conf/qubes-kickstart.cfg
similarity index 100%
rename from conf/qubes-1-respin.cfg
rename to conf/qubes-kickstart.cfg
diff --git a/conf/qubes1-x86_64-respin.conf b/conf/qubes-x86_64.conf
similarity index 100%
rename from conf/qubes1-x86_64-respin.conf
rename to conf/qubes-x86_64.conf