diff --git a/docs/src/usage/existing_device.md b/docs/src/usage/existing_device.md
index fac6d3695..4f6d8c665 100644
--- a/docs/src/usage/existing_device.md
+++ b/docs/src/usage/existing_device.md
@@ -23,8 +23,8 @@ To add an existing NixOS device to Thymis, follow these steps:
 
 ### Step 2: Add a New Device
 
-1. Click on the **Devices** tab in the sidebar.
-2. Select **Create New Device**.
+1. Click on the **Configurations** tab in the sidebar.
+2. Select **Create New Configuration**.
 3. Fill in the required details, such as the device name, hardware model, as well as tags to associate with the device.
 
 ![Thymis create device screen](thymis-create-device.png)
diff --git a/docs/src/usage/provisioning.md b/docs/src/usage/provisioning.md
index 1ab1c17f7..32a7a7655 100644
--- a/docs/src/usage/provisioning.md
+++ b/docs/src/usage/provisioning.md
@@ -8,15 +8,15 @@ Provisioning a new device with Thymis involves creating a fully-configured disk
 
 ![Thymis Login-Screen](thymis-login-screen.png)
 
-## Step 2: Create a New Device Profile!
-1. Click on the **Devices** tab in the sidebar.
-2. Select **Create New Device**.
+## Step 2: Create a New Device Configuration!
+1. Click on the **Configurations** tab in the sidebar.
+2. Select **Create New Configuration**.
 3. Fill in the required details, such as the device name, hardware model, as well as tags to associate with the device.
 
 ![Thymis create device screen](thymis-create-device.png)
 
 ## Step 3: Configure the Device Settings
-1. In the **Devices** tab, select **View Details** for the device you just created.
+1. In the **Configurations** tab, select **View Details** for the device configuration you just created.
 2. Click on **Core Device Configuration** to access the device configuration interface.
 3. Use the graphical interface to set up the NixOS modules and services you want to include in your device's image.
 4. Save the configuration when done.
diff --git a/frontend/tests/screencaps.spec.ts b/frontend/tests/screencaps.spec.ts
index c4960a622..e08ec6da7 100644
--- a/frontend/tests/screencaps.spec.ts
+++ b/frontend/tests/screencaps.spec.ts
@@ -217,10 +217,10 @@ colorSchemes.forEach((colorScheme) => {
 			// Assign the tag
 			await page.goto('/configuration/list');
 
-			await page.locator('button').filter({ hasText: 'Create New Device' }).click();
+			await page.locator('button').filter({ hasText: 'Create New Configuration' }).click();
 			await page.locator('#display-name').first().fill('Whoami Device');
 			await page.locator('#device-type').first().selectOption({ label: 'Raspberry Pi 4' });
-			await page.locator('button').filter({ hasText: 'Create device' }).click();
+			await page.locator('button').filter({ hasText: 'Create device configuration' }).click();
 
 			const editTagButton = page
 				.locator('tr')