diff --git a/README b/README
index 6cd19f3414b..ecb67a871ae 100644
--- a/README
+++ b/README
@@ -58,7 +58,7 @@
 
 - Do the installation:
 
-  $ nixos-installer.sh ROOTDIR . my-config.nix
+  $ nixos-install.sh ROOTDIR . my-config.nix
 
   where ROOTDIR is the mount point of the target root device (i.e.,
   boot.rootDevice in your configuration).
@@ -131,9 +131,9 @@ To get out of maintenance mode:
 
 - Testing the installer:
 
-  $ nix-build configuration/rescue-cd.nix -A system.nixosInstaller
+  $ nix-build configuration/rescue-cd.nix -A system.nixosInstall
   $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
   $ yes | mke2fs -j diskimage
   $ mount -o loop diskimage /mnt
-  $ ./result/bin/nixos-installer
+  $ ./result/bin/nixos-install
 
diff --git a/installer/nixos-installer.nix b/installer/nixos-install.nix
similarity index 87%
rename from installer/nixos-installer.nix
rename to installer/nixos-install.nix
index 66320e51c34..8e3eff4d947 100644
--- a/installer/nixos-installer.nix
+++ b/installer/nixos-install.nix
@@ -5,8 +5,8 @@
 }:
 
 substituteAll {
-  name = "nixos-installer";
-  src = ./nixos-installer.sh;
+  name = "nixos-install";
+  src = ./nixos-install.sh;
   dir = "bin";
   isExecutable = true;
   inherit nix nixpkgsURL perl;
diff --git a/installer/nixos-installer.sh b/installer/nixos-install.sh
similarity index 100%
rename from installer/nixos-installer.sh
rename to installer/nixos-install.sh
diff --git a/system/system.nix b/system/system.nix
index 7587c7fa831..58b638ea463 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -110,7 +110,7 @@ rec {
 
 
   # The installer.
-  nixosInstaller = import ../installer/nixos-installer.nix {
+  nixosInstall = import ../installer/nixos-install.nix {
     inherit (pkgs) stdenv perl runCommand substituteAll;
     inherit nix;
     nixpkgsURL = config.get ["installer" "nixpkgsURL"];
@@ -185,7 +185,7 @@ rec {
     pkgs.utillinux
 #    pkgs.vim
     nix
-    nixosInstaller
+    nixosInstall
     setuidWrapper
   ];