diff --git a/CHANGES.md b/CHANGES.md
index 677158ab..931eda61 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -68,16 +68,18 @@
   - The following default values have changed. If your deployment was using the old default value, update your 
     ``env.local`` file to explicitly set the old default values.
 
-    | old variable name                          | new variable name                    | old default value       | new default value          |
-    |--------------------------------------------|--------------------------------------|-------------------------|:---------------------------|
-    | POSTGRES_PAVICS_USERNAME                   | BIRDHOUSE_POSTGRES_USERNAME          | postgres-pavics         | postgres-birdhouse         |
-    | THREDDS_DATASET_LOCATION_ON_CONTAINER      | (no change)                          | /pavics-ncml            | /birdhouse-ncml            |
-    | THREDDS_SERVICE_DATA_LOCATION_ON_CONTAINER | (no change)                          | /pavics-data            | /birdhouse-data            |
-    | (hardcoded)                                | BIRDHOUSE_POSTGRES_DB                | pavics                  | birdhouse                  |
-    | PAVICS_LOG_DIR                             | BIRDHOUSE_LOG_DIR                    | /var/log/PAVICS         | /var/log/birdhouse         |
-    | (hardcoded)                                | GRAFANA_DEFAULT_PROVIDER_FOLDER      | Local-PAVICS            | Local-Birdhouse            |
-    | (hardcoded)                                | GRAFANA_DEFAULT_PROVIDER_FOLDER_UUID | local-pavics            | local-birdhouse            |
-    | (hardcoded)                                | GRAFANA_PROMETHEUS_DATASOURCE_UUID   | local_pavics_prometheus | local_birdhouse_prometheus |
+    | old variable name                          | new variable name                    | old default value               | new default value                                     |
+    |--------------------------------------------|--------------------------------------|---------------------------------|:------------------------------------------------------|
+    | POSTGRES_PAVICS_USERNAME                   | BIRDHOUSE_POSTGRES_USERNAME          | postgres-pavics                 | postgres-birdhouse                                    |
+    | THREDDS_DATASET_LOCATION_ON_CONTAINER      | (no change)                          | /pavics-ncml                    | /birdhouse-datasets                                   |
+    | THREDDS_SERVICE_DATA_LOCATION_ON_CONTAINER | (no change)                          | /pavics-data                    | /birdhouse-service-data                               |
+    | THREDDS_DATASET_LOCATION_ON_HOST           | (no change)                          | '${DATA_PERSIST_ROOT}/ncml'     | '${BIRDHOUSE_DATA_PERSIST_ROOT}/thredds-datasets'     |
+    | THREDDS_SERVICE_DATA_LOCATION_ON_HOST      | (no change)                          | '${DATA_PERSIST_ROOT}/datasets' | '${BIRDHOUSE_DATA_PERSIST_ROOT}/thredds-service-data' |
+    | (hardcoded)                                | BIRDHOUSE_POSTGRES_DB                | pavics                          | birdhouse                                             |
+    | PAVICS_LOG_DIR                             | BIRDHOUSE_LOG_DIR                    | /var/log/PAVICS                 | /var/log/birdhouse                                    |
+    | (hardcoded)                                | GRAFANA_DEFAULT_PROVIDER_FOLDER      | Local-PAVICS                    | Local-Birdhouse                                       |
+    | (hardcoded)                                | GRAFANA_DEFAULT_PROVIDER_FOLDER_UUID | local-pavics                    | local-birdhouse                                       |
+    | (hardcoded)                                | GRAFANA_PROMETHEUS_DATASOURCE_UUID   | local_pavics_prometheus         | local_birdhouse_prometheus                            |
 
     Note that the `PAVICS_LOG_DIR` variable was actually hardcoded as `/var/log/PAVICS` in some scripts. If 
     `PAVICS_LOG_DIR` was set to anything other than `/var/log/PAVICS` you'll end up with inconsistent log outputs as 
diff --git a/birdhouse/components/thredds/default.env b/birdhouse/components/thredds/default.env
index e39a1100..d0fbb91f 100644
--- a/birdhouse/components/thredds/default.env
+++ b/birdhouse/components/thredds/default.env
@@ -8,10 +8,10 @@ export THREDDS_IMAGE_URI='registry.hub.docker.com/${THREDDS_IMAGE}'
 export THREDDS_ORGANIZATION="Birdhouse"
 export THREDDS_ADDITIONAL_CATALOG=""
 
-export THREDDS_DATASET_LOCATION_ON_CONTAINER='/birdhouse-ncml'
-export THREDDS_SERVICE_DATA_LOCATION_ON_CONTAINER='/birdhouse-data'
-export THREDDS_DATASET_LOCATION_ON_HOST='${BIRDHOUSE_DATA_PERSIST_ROOT}/ncml'
-export THREDDS_SERVICE_DATA_LOCATION_ON_HOST='${BIRDHOUSE_DATA_PERSIST_ROOT}/datasets'
+export THREDDS_DATASET_LOCATION_ON_CONTAINER='/birdhouse-datasets'
+export THREDDS_SERVICE_DATA_LOCATION_ON_CONTAINER='/birdhouse-service-data'
+export THREDDS_DATASET_LOCATION_ON_HOST='${BIRDHOUSE_DATA_PERSIST_ROOT}/thredds-datasets'
+export THREDDS_SERVICE_DATA_LOCATION_ON_HOST='${BIRDHOUSE_DATA_PERSIST_ROOT}/thredds-service-data'
 export THREDDS_DATASET_LOCATION_NAME='Datasets'
 export THREDDS_SERVICE_DATA_LOCATION_NAME='Birdhouse'
 export THREDDS_DATASET_URL_PATH='datasets'
diff --git a/birdhouse/optional-components/generic_bird/.gitignore b/birdhouse/optional-components/generic_bird/.gitignore
index 52980394..08364997 100644
--- a/birdhouse/optional-components/generic_bird/.gitignore
+++ b/birdhouse/optional-components/generic_bird/.gitignore
@@ -1,5 +1,6 @@
 wps.cfg
 postgres/credentials.env
+postgres/docker-entrypoint-initdb.d/create-wps-databases.sql.template
 config/canarie-api/canarie_api_monitoring.py
 config/magpie/providers.cfg
 config/magpie/permissions.cfg
diff --git a/tests/test_read_configs_include.py b/tests/test_read_configs_include.py
index a85a6b57..2abeda35 100644
--- a/tests/test_read_configs_include.py
+++ b/tests/test_read_configs_include.py
@@ -11,7 +11,7 @@
 
 # Set backwards compatible allowed to False explicitly since the current default
 # is True when not executing through the CLI.
-# tmut may add a bunch of messages to stderr if this is not set. This may cause confusion when trying to debug a
+# tput may add a bunch of messages to stderr if this is not set. This may cause confusion when trying to debug a
 # pytest error since these messages are unrelated to failing tests.
 DEFAULT_BIRDHOUSE_ENV = {"BIRDHOUSE_BACKWARD_COMPATIBLE_ALLOWED": "False", "TERM": os.getenv("TERM", "")}