diff --git a/README.md b/README.md
index f646fe03179d093f21eba380f3c7b012e459884b..f7677dd741c6fddf86f36c298e393be704c9953e 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ the host system.
 
 ```bash
 vagrant ssh
-sudo sh /data/infrastructure/scripts/approve-user.sh example.dev wordpress
+sudo sh /data/indiehosters/scripts/approve-user.sh example.dev wordpress
 ```
 Check https://example.dev in your bowser!
 
diff --git a/Vagrantfile b/Vagrantfile
index dcaab64b37623c0852085f74d6137c62913a89dd..fe2500e1e2c9f12cbe298fdd3a09289b63ea0eae 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -42,9 +42,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       core.vm.hostname = HOSTNAME
       core.hostsupdater.aliases = ["example.dev"]
       core.vm.network :private_network, ip: "#{BASE_IP_ADDR}.#{i+1}"
-      core.vm.synced_folder ".", "/data/infrastructure", id: "coreos-infrastructure", :nfs => true, :mount_options => ['nolock,vers=3,udp']
+      core.vm.synced_folder ".", "/data/indiehosters", id: "coreos-indiehosters", :nfs => true, :mount_options => ['nolock,vers=3,udp']
       core.vm.provision :file, source: "./cloud-config", destination: "/tmp/vagrantfile-user-data"
-      core.vm.provision :shell, inline: "cp /data/infrastructure/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
+      core.vm.provision :shell, inline: "cp /data/indiehosters/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
       core.vm.provision :shell, path: "./scripts/setup.sh", args: [HOSTNAME]
       core.vm.provision :shell, inline: "etcdctl set /services/default '{\"app\":\"nginx\", \"hostname\":\"#{HOSTNAME}\"}'"
       core.vm.provision :shell, path: "./scripts/approve-user.sh", args: [HOSTNAME, "nginx"]
diff --git a/importers/wordpress.sh b/importers/wordpress.sh
index 6e38abb2fc178453c26fcb4b3ac175cbaed01df4..7e1f05698acd5488aaf8be1f18c304dd0c551466 100755
--- a/importers/wordpress.sh
+++ b/importers/wordpress.sh
@@ -2,6 +2,6 @@
 
 if [ ! -d "/data/per-user/$USER/wordpress/data" ]; then
   cd /data/per-user/$USER/
-  tar xvzf /data/infrastructure/blueprints/wordpress.tgz
+  tar xvzf /data/indiehosters/blueprints/wordpress.tgz
   cat /data/per-user/$USER/mysql/.env | sed s/MYSQL_PASS/DB_PASS/ > /data/per-user/$USER/wordpress/.env
 fi
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 442336005159faa94bfb7b4644103ca0dd368eaf..3c680b9917aa9e33388eddaba65d67c9fc06c19e 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -6,7 +6,7 @@ if [ -f /tmp/vagrantfile-user-data ]; then
 fi
 
 # Install unit-files
-cp /data/infrastructure/unit-files/* /etc/systemd/system
+cp /data/indiehosters/unit-files/* /etc/systemd/system
 systemctl daemon-reload
 
 # Pull relevant docker images
diff --git a/unit-files/mysql-importer@.service b/unit-files/mysql-importer@.service
index f05608da5b69c6c04ce9233271abe561842272e6..77af011a0f0b8388a2d225ac4014f4a6db7bdfe7 100644
--- a/unit-files/mysql-importer@.service
+++ b/unit-files/mysql-importer@.service
@@ -6,7 +6,7 @@ Before=mysql@%i.service
 Type=oneshot
 RemainAfterExit=yes
 Environment=USER=%i
-ExecStart=/data/infrastructure/importers/mysql.sh
+ExecStart=/data/indiehosters/importers/mysql.sh
 
 [Install]
 WantedBy=mysql@%i.service
diff --git a/unit-files/nginx-importer@.service b/unit-files/nginx-importer@.service
index dfb71b74e5da194f5944aca247d8332464e8c6cb..3a0e4390ef74683319b945698b096bb697050800 100644
--- a/unit-files/nginx-importer@.service
+++ b/unit-files/nginx-importer@.service
@@ -6,7 +6,7 @@ Before=nginx@%i.service
 Type=oneshot
 RemainAfterExit=yes
 Environment=USER=%i
-ExecStart=/data/infrastructure/importers/nginx.sh
+ExecStart=/data/indiehosters/importers/nginx.sh
 
 [Install]
 WantedBy=nginx@%i.service
diff --git a/unit-files/wordpress-importer@.service b/unit-files/wordpress-importer@.service
index c1a4771fc7c712b297a46672358ff4476d0a3c96..33f56658ef84e4e5137659ae429abcc5548bb05c 100644
--- a/unit-files/wordpress-importer@.service
+++ b/unit-files/wordpress-importer@.service
@@ -7,7 +7,7 @@ Before=wordpress@%i.service
 Type=oneshot
 RemainAfterExit=yes
 Environment=USER=%i
-ExecStart=/data/infrastructure/importers/wordpress.sh
+ExecStart=/data/indiehosters/importers/wordpress.sh
 
 [Install]
 WantedBy=wordpress@%i.service