        area_sqm,
        loci21_uri::text,
        geom
-  FROM raw_admin_bdys_202108.aus_sa4_2021 AS tab
-  INNER JOIN raw_admin_bdys_202108.aus_state AS ste ON tab.state_pid = ste.state_pid;
+  FROM raw_admin_bdys.aus_sa4_2021 AS tab
+  INNER JOIN raw_admin_bdys.aus_state AS ste ON tab.state_pid = ste.state_pid;
 
-ALTER TABLE admin_bdys_202108.abs_2021_sa4 ADD CONSTRAINT abs_2021_sa4_pk PRIMARY KEY (gid);
-CREATE INDEX abs_2021_sa4_geom_idx ON admin_bdys_202108.abs_2021_sa4 USING gist(geom);
-ALTER TABLE admin_bdys_202108.abs_2021_sa4 CLUSTER ON abs_2021_sa4_geom_idx;
+ALTER TABLE admin_bdys.abs_2021_sa4 ADD CONSTRAINT abs_2021_sa4_pk PRIMARY KEY (gid);
+CREATE INDEX abs_2021_sa4_geom_idx ON admin_bdys.abs_2021_sa4 USING gist(geom);
+ALTER TABLE admin_bdys.abs_2021_sa4 CLUSTER ON abs_2021_sa4_geom_idx;
 
 
 -- # ---------------------------------------------------------------------------------
 -- ABS census 2021 - greater capital city statistical areas
 --------------------------------------------------------------------------------------
 
-DROP TABLE IF EXISTS admin_bdys_202108.abs_2021_gccsa CASCADE;
-CREATE TABLE admin_bdys_202108.abs_2021_gccsa AS
+DROP TABLE IF EXISTS admin_bdys.abs_2021_gccsa CASCADE;
+CREATE TABLE admin_bdys.abs_2021_gccsa AS
 SELECT tab.gid,
        gcc_21ppid,
        tab.dt_create,

       mb21_pop,
       loci21_uri::text,
       geom
  FROM raw_admin_bdys_202108.aus_mb_2021 AS tab
  INNER JOIN raw_admin_bdys_202108.aus_state AS ste ON tab.state_pid = ste.state_pid;

ALTER TABLE admin_bdys_202108.abs_2021_mb ADD CONSTRAINT abs_2021_mb_pk PRIMARY KEY (gid);
CREATE INDEX abs_2021_mb_geom_idx ON admin_bdys_202108.abs_2021_mb USING gist(geom);
ALTER TABLE admin_bdys_202108.abs_2021_mb CLUSTER ON abs_2021_mb_geom_idx;


-- # ---------------------------------------------------------------------------------
-- ABS census 2021 - statistical area 1's
--------------------------------------------------------------------------------------

DROP TABLE IF EXISTS admin_bdys_202108.abs_2021_sa1 CASCADE;
CREATE TABLE admin_bdys_202108.abs_2021_sa1 AS
SELECT tab.gid,
       sa1_21ppid,
       tab.dt_create,

       area_sqm,
       loci21_uri::text,
       geom
  FROM raw_admin_bdys.aus_sa2_2021 AS tab
  INNER JOIN raw_admin_bdys.aus_state AS ste ON tab.state_pid = ste.state_pid;

ALTER TABLE admin_bdys.abs_2021_sa2 ADD CONSTRAINT abs_2021_sa2_pk PRIMARY KEY (gid);
CREATE INDEX abs_2021_sa2_geom_idx ON admin_bdys.abs_2021_sa2 USING gist(geom);
ALTER TABLE admin_bdys.abs_2021_sa2 CLUSTER ON abs_2021_sa2_geom_idx;


-- # ---------------------------------------------------------------------------------
-- ABS census 2021 - statistical area 3's
--------------------------------------------------------------------------------------

DROP TABLE IF EXISTS admin_bdys.abs_2021_sa3 CASCADE;
CREATE TABLE admin_bdys.abs_2021_sa3 AS
SELECT tab.gid,
       sa3_21ppid,
       tab.dt_create,
