diff --git a/README.md b/README.md
index ef6194f..c995b60 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,10 @@ Each Dataform has their own development environment to prevent collisions while
 
 * GCP Project: pphe-data-dev
   * BQ Datasets:
-    * Staging Tables: dev_{username}_stg_{source_name}
-      * e.g, dev_bwyllie_stg_opera
+    * Staging Tables: stg_{source_name}_{username}
+      * e.g, stg_opera_bwyllie
     * Gold Tables: dev_{username}_gld_{destination_name}
-      * e.g, dev_bwyllie_gld_board
+      * e.g, gld_board_{username}
 
 These transformations also have a built-in `WHERE` clause to select just a small amount of data from the raw source tables.
 
@@ -41,8 +41,8 @@ Once the transformations have been successfully reviewed and promoted to Prod, t
 
 * GCP Project: pphe-data-pro
   * BQ Datasets:
-    * Sources: src_{source_name}_stg
-      * e.g, src_opera_stg
+    * Sources: stg_{source_name}
+      * e.g, stg_opera
     * Gold Tables: gld_{destination_name}
       * e.g, gld_board
 
diff --git a/definitions/staging/board/test_model.sqlx b/definitions/staging/board/test_model.sqlx
new file mode 100644
index 0000000..1abee0c
--- /dev/null
+++ b/definitions/staging/board/test_model.sqlx
@@ -0,0 +1,8 @@
+config {
+    type: "view",
+    description: "Test model",
+    schema: "stg_board"
+}
+
+SELECT
+  2 AS testfield
diff --git a/workflow_settings.yaml b/workflow_settings.yaml
index 196f0b7..3fd2a51 100644
--- a/workflow_settings.yaml
+++ b/workflow_settings.yaml
@@ -1,5 +1,5 @@
 defaultProject: pphe-data-dev
 defaultLocation: EU
-defaultDataset: dataform
-defaultAssertionDataset: dataform
+defaultDataset: raw_dataform
+defaultAssertionDataset: raw_dataform
 dataformCoreVersion: 3.0.26
\ No newline at end of file