diff --git a/README.md b/README.md
index 7b41454..2e100b3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-## ec2-build-docker-host
+## ec2-build-container-host
 
-This script sets up a Docker test system based on NixOS. For configuration options consult:
+This script sets up a container host test system based on NixOS. For configuration options consult:
 
 https://search.nixos.org/options
 
@@ -8,12 +8,12 @@ To change the resulting system, edit the *configuration.nix* and re-run the scri
 
 ### Usage
 ```
-git clone https://github.com/mrckndt/ec2-build-docker-host
-cd ec2-build-docker-host
+git clone https://github.com/mrckndt/ec2-build-container-host
+cd ec2-build-container-host
 
-bash ec2-build-docker-host -i <PATH-TO-IDENTITY-FILE>
+bash ec2-build-container-host -i <PATH-TO-IDENTITY-FILE>
 or
-./ec2-build-docker-host -i <PATH-TO-IDENTITY-FILE>
+./ec2-build-container-host -i <PATH-TO-IDENTITY-FILE>
 ```
 
 Follow the shown instructions and wait...
diff --git a/configuration.nix b/configuration.nix
index f1eaf12..b6f9860 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,7 +6,7 @@ let
   allowedTCPPorts = [ 80 443 8065 ];
   allowedUDPPorts = [ ];
   autoUpdateContainers = true;
-  hostName = "nixos-docker-test";
+  hostName = "nixos-container-host";
   systemPackages = with pkgs; [
     bind
     bmon
diff --git a/ec2-build-docker-host b/ec2-build-container-host
similarity index 100%
rename from ec2-build-docker-host
rename to ec2-build-container-host