diff --git a/type/__matrix_riot/files/config.json.sh b/type/__matrix_element/files/config.json.sh
similarity index 96%
rename from type/__matrix_riot/files/config.json.sh
rename to type/__matrix_element/files/config.json.sh
index 6cd1648..9791f38 100755
--- a/type/__matrix_riot/files/config.json.sh
+++ b/type/__matrix_element/files/config.json.sh
@@ -39,7 +39,7 @@ EOF
     fi
 
     cat << EOF
-    "welcomeBackgroundUrl": "themes/riot/img/backgrounds/valley.jpg"
+    "welcomeBackgroundUrl": "themes/element/img/backgrounds/lake.jpg"
 EOF
     echo '},'
 }
diff --git a/type/__matrix_riot/gencode-remote b/type/__matrix_element/gencode-remote
similarity index 97%
rename from type/__matrix_riot/gencode-remote
rename to type/__matrix_element/gencode-remote
index dbc886c..e643976 100755
--- a/type/__matrix_riot/gencode-remote
+++ b/type/__matrix_element/gencode-remote
@@ -46,7 +46,7 @@ cd \$tmpdir
 curl -L '$url' > $archive
 tar xf $archive
 
-# Backup files deployed by __matrix_riot.
+# Backup files deployed by __matrix_element.
 mkdir -p \$custom_files_dir
 for file in $INSTALL_DIR/cdist/*; do
   cp "\$file" "\$custom_files_dir"
diff --git a/type/__matrix_riot/man.rst b/type/__matrix_element/man.rst
similarity index 73%
rename from type/__matrix_riot/man.rst
rename to type/__matrix_element/man.rst
index 2fe8eae..c3e0d5a 100644
--- a/type/__matrix_riot/man.rst
+++ b/type/__matrix_element/man.rst
@@ -1,23 +1,23 @@
-cdist-type__matrix_riot(7)
+cdist-type__matrix_element(7)
 ======================
 
 NAME
 ----
-cdist-type__matrix_riot - Install and configure Riot, a web Matrix client.
+cdist-type__matrix_element - Install and configure Element, a web Matrix client.
 
 
 DESCRIPTION
 -----------
-This type install and configure the Riot web client.
+This type install and configure the Element web client.
 
 
 REQUIRED PARAMETERS
 -------------------
 install_dir
-  Root directory of Riot's static files.
+  Root directory of Element's static files.
 
 version
-  Release of Riot to install.
+  Release of Element to install.
 
 OPTIONAL PARAMETERS
 -------------------
@@ -31,20 +31,20 @@ owner
   Owner of the deployed files, passed to `chown`. Defaults to 'root'.
 
 brand
-  Web UI branding, defaults to 'Riot'.
+  Web UI branding, defaults to 'Element'.
 
 default_country_code
   ISO 3166 alpha2 country code to use when showing country selectors, such as
   phone number inputs. Defaults to GB.
 
 privacy_policy_url
-  Defaults to 'https://riot.im/privacy'.
+  Defaults to 'https://element.io/privacy'.
 
 cookie_policy_url
-  Defaults to 'https://matrix.org/docs/guides/riot_im_cookie_policy'.
+  Defaults to 'https://matrix.org/docs/guides/element_im_cookie_policy'.
 
 jitsi_domain
-  Domain name of preferred Jitsi instance (default is jitsi.riot.im). This is
+  Domain name of preferred Jitsi instance (default is jitsi.element.im). This is
   used whenever a user clicks on the voice/video call buttons.
 
 homepage
@@ -66,7 +66,7 @@ EXAMPLES
 
 .. code-block:: sh
 
-    __matrix_riot my-riot --install_dir /var/www/riot-web --version 1.5.6
+    __matrix_element my-element --install_dir /var/www/element-web --version 1.5.6
 
 
 SEE ALSO
diff --git a/type/__matrix_riot/manifest b/type/__matrix_element/manifest
similarity index 100%
rename from type/__matrix_riot/manifest
rename to type/__matrix_element/manifest
diff --git a/type/__matrix_riot/parameter/boolean b/type/__matrix_element/parameter/boolean
similarity index 100%
rename from type/__matrix_riot/parameter/boolean
rename to type/__matrix_element/parameter/boolean
diff --git a/type/__matrix_element/parameter/default/brand b/type/__matrix_element/parameter/default/brand
new file mode 100644
index 0000000..907f907
--- /dev/null
+++ b/type/__matrix_element/parameter/default/brand
@@ -0,0 +1 @@
+Element
diff --git a/type/__matrix_riot/parameter/default/cookie_policy_url b/type/__matrix_element/parameter/default/cookie_policy_url
similarity index 100%
rename from type/__matrix_riot/parameter/default/cookie_policy_url
rename to type/__matrix_element/parameter/default/cookie_policy_url
diff --git a/type/__matrix_riot/parameter/default/default_country_code b/type/__matrix_element/parameter/default/default_country_code
similarity index 100%
rename from type/__matrix_riot/parameter/default/default_country_code
rename to type/__matrix_element/parameter/default/default_country_code
diff --git a/type/__matrix_riot/parameter/default/default_server_name b/type/__matrix_element/parameter/default/default_server_name
similarity index 100%
rename from type/__matrix_riot/parameter/default/default_server_name
rename to type/__matrix_element/parameter/default/default_server_name
diff --git a/type/__matrix_riot/parameter/default/default_server_url b/type/__matrix_element/parameter/default/default_server_url
similarity index 100%
rename from type/__matrix_riot/parameter/default/default_server_url
rename to type/__matrix_element/parameter/default/default_server_url
diff --git a/type/__matrix_riot/parameter/default/owner b/type/__matrix_element/parameter/default/owner
similarity index 100%
rename from type/__matrix_riot/parameter/default/owner
rename to type/__matrix_element/parameter/default/owner
diff --git a/type/__matrix_element/parameter/default/privacy_policy_url b/type/__matrix_element/parameter/default/privacy_policy_url
new file mode 100644
index 0000000..37fa4bc
--- /dev/null
+++ b/type/__matrix_element/parameter/default/privacy_policy_url
@@ -0,0 +1 @@
+https://element.io/privacy
diff --git a/type/__matrix_riot/parameter/default/room_directory_servers b/type/__matrix_element/parameter/default/room_directory_servers
similarity index 100%
rename from type/__matrix_riot/parameter/default/room_directory_servers
rename to type/__matrix_element/parameter/default/room_directory_servers
diff --git a/type/__matrix_riot/parameter/optional b/type/__matrix_element/parameter/optional
similarity index 100%
rename from type/__matrix_riot/parameter/optional
rename to type/__matrix_element/parameter/optional
diff --git a/type/__matrix_riot/parameter/optional_multiple b/type/__matrix_element/parameter/optional_multiple
similarity index 100%
rename from type/__matrix_riot/parameter/optional_multiple
rename to type/__matrix_element/parameter/optional_multiple
diff --git a/type/__matrix_riot/parameter/required b/type/__matrix_element/parameter/required
similarity index 100%
rename from type/__matrix_riot/parameter/required
rename to type/__matrix_element/parameter/required
diff --git a/type/__matrix_riot/parameter/default/brand b/type/__matrix_riot/parameter/default/brand
deleted file mode 100644
index e8095bb..0000000
--- a/type/__matrix_riot/parameter/default/brand
+++ /dev/null
@@ -1 +0,0 @@
-Riot
diff --git a/type/__matrix_riot/parameter/default/privacy_policy_url b/type/__matrix_riot/parameter/default/privacy_policy_url
deleted file mode 100644
index 4cdd12c..0000000
--- a/type/__matrix_riot/parameter/default/privacy_policy_url
+++ /dev/null
@@ -1 +0,0 @@
-https://riot.im/privacy