diff --git a/source/getting-started/installation-virtualenv.markdown b/source/getting-started/installation-virtualenv.markdown
index de203ac9292..e176aba0c0f 100644
--- a/source/getting-started/installation-virtualenv.markdown
+++ b/source/getting-started/installation-virtualenv.markdown
@@ -44,7 +44,7 @@ This can be anywhere you want. As example we put it in `/srv`. You also need to
 
 ```bash
 $ sudo mkdir /srv/homeassistant
-$ sudo chown hass /srv/homeassistant
+$ sudo chown homeassistant /srv/homeassistant
 ```
 
 ### {% linkable_title Step 3: Become the new user %}
@@ -73,21 +73,21 @@ $ virtualenv -p python3 /srv/homeassistant
 $ source /srv/homeassistant/bin/activate
 ```
 
-After that, your prompt should include `(hass)`.
+After that, your prompt should include `(homeassistant)`.
 
 ### {% linkable_title Step 6: Install Home Assistant %}
 
-Once your virtualenv has been activated, you don't need to `sudo` any of your `pip` commands. `pip` will be installing things in the virtualenv, which the `hass` user has permission to modify.
+Once your virtualenv has been activated, you don't need to `sudo` any of your `pip` commands. `pip` will be installing things in the virtualenv, which the `homeassistant` user has permission to modify.
 
 ```bash
-(hass)$ pip3 install --upgrade homeassistant
+(homeassistant)$ pip3 install --upgrade homeassistant
 ```
 
 And that's it... you now have Home Assistant installed, and you can be sure that every bit of it is contained in `/srv/homeassistant`.
 
 ### {% linkable_title Finally... Run Home Assistant %}
 
-There are two ways to launch Home Assistant. If you are **in** the virtualenv, you can just run `hass` and it will work as normal. If the virtualenv is not activated, you just use the `hass` executable in the `bin` directory mentioned earlier. There is one caveat... Because Home Assistant stores its configuration in the user's home directory, we need to be the user `hass` user or specify the configuration with `-c`.
+There are two ways to launch Home Assistant. If you are **in** the virtualenv, you can just run `hass` and it will work as normal. If the virtualenv is not activated, you just use the `hass` executable in the `bin` directory mentioned earlier. There is one caveat... Because Home Assistant stores its configuration in the user's home directory, we need to be the user `homeassistant` user or specify the configuration with `-c`.
 
 ```bash
 $ sudo -u homeassistant -H /srv/homeassistant/bin/hass
@@ -101,13 +101,13 @@ Upgrading Home Assistant is simple, just repeat steps 3, 5 and 6.
 
 ### {% linkable_title Starting Home Assistant on boot %}
 
-The [autostart instructions](/getting-started/autostart/) will work just fine, just be sure to replace `/usr/bin/hass` with `/srv/hass/bin/hass` and specify the `hass` user where appropriate.
+The [autostart instructions](/getting-started/autostart/) will work just fine, just be sure to replace `/usr/bin/hass` with `/srv/homeassistant/bin/hass` and specify the `homeassistant` user where appropriate.
 
 ### {% linkable_title Installing python-openzwave %}
 
 If you want to use Z-Wave devices, you will need to install `python-openzwave` in your virtualenv. This requires a small tweak to the instructions in [the Z-Wave Getting Started documentation](/getting-started/z-wave/)
 
-Install the dependencies as normal (Note: you will need to do this as your normal user, since `hass` isn't a sudoer).
+Install the dependencies as normal (Note: you will need to do this as your normal user, since `homeassistant` isn't a sudoer).
 
 ```bash
 $ sudo apt-get install cython3 libudev-dev python3-sphinx python3-setuptools
@@ -116,17 +116,17 @@ $ sudo apt-get install cython3 libudev-dev python3-sphinx python3-setuptools
 Then, activate your virtualenv (steps 3 and 5 above) and upgrade cython.
 
 ```bash
-(hass)$ pip3 install --upgrade cython==0.24.1
+(homeassistant)$ pip3 install --upgrade cython==0.24.1
 ```
 
 Finally, get and install `python-openzwave`.
 
 ```bash
-(hass)$ mkdir /srv/homeassistant/src
-(hass)$ cd /srv/homeassistant/src
-(hass)$ git clone https://github.com/OpenZWave/python-openzwave.git
-(hass)$ cd python-openzwave
-(hass)$ git checkout python3
-(hass)$ PYTHON_EXEC=`which python3` make build
-(hass)$ PYTHON_EXEC=`which python3` make install
+(homeassistant)$ mkdir /srv/homeassistant/src
+(homeassistant)$ cd /srv/homeassistant/src
+(homeassistant)$ git clone https://github.com/OpenZWave/python-openzwave.git
+(homeassistant)$ cd python-openzwave
+(homeassistant)$ git checkout python3
+(homeassistant)$ PYTHON_EXEC=`which python3` make build
+(homeassistant)$ PYTHON_EXEC=`which python3` make install
 ```