diff --git a/models/staging/exchange/base/base_exchange__voucher_redemptions.sql b/models/staging/exchange/stg_exchange__voucher_redemptions.sql
similarity index 85%
rename from models/staging/exchange/base/base_exchange__voucher_redemptions.sql
rename to models/staging/exchange/stg_exchange__voucher_redemptions.sql
index 3f62da6..85dbcc9 100644
--- a/models/staging/exchange/base/base_exchange__voucher_redemptions.sql
+++ b/models/staging/exchange/stg_exchange__voucher_redemptions.sql
@@ -1,9 +1,9 @@
 -- IMPORTS
 WITH source AS (
     SELECT * FROM {{ source('src_exchange_mysql', 'voucher_redemptions') }}
-
 ),
 
+
 -- LOGIC
 voucher_redemptions_rename AS (
 
@@ -15,14 +15,16 @@ voucher_redemptions_rename AS (
         value               AS voucher_credit,
         created_at          AS created_datetime,
         updated_at          AS updated_datetime,
+
         '{{ modules.datetime.datetime.now(modules.pytz.timezone("Asia/Kuala_Lumpur")) }}' AS _dbt_ran_datetime
 
     FROM source
 
 ),
 
+
 -- FINAL
-final__base_exchange__voucher_redemptions AS (
+final__stg_exchange__voucher_redemptions AS (
 
     SELECT
         -- ids
@@ -47,4 +49,4 @@ final__base_exchange__voucher_redemptions AS (
 
 )
 
-SELECT * FROM final__base_exchange__voucher_redemptions
+SELECT * FROM final__stg_exchange__voucher_redemptions
\ No newline at end of file
diff --git a/models/staging/exchange/base/base_exchange__vouchers.sql b/models/staging/exchange/stg_exchange__vouchers.sql
similarity index 67%
rename from models/staging/exchange/base/base_exchange__vouchers.sql
rename to models/staging/exchange/stg_exchange__vouchers.sql
index ab6229a..6b7ca99 100644
--- a/models/staging/exchange/base/base_exchange__vouchers.sql
+++ b/models/staging/exchange/stg_exchange__vouchers.sql
@@ -1,9 +1,9 @@
--- IMPORTS
+-- IMPORT
 WITH source AS (
     SELECT * FROM {{ source('src_exchange_mysql', 'vouchers') }}
-
 ),
 
+
 -- LOGIC
 vouchers_rename AS (
 
@@ -11,18 +11,22 @@ vouchers_rename AS (
         id              AS voucher_id,
         name,
         code,
-        type,
+        type            AS credit_type,
         value           AS voucher_credit,
+        start_date      AS voucher_start_datetime,
+        end_date        AS voucher_end_datetime
         created_at      AS created_datetime,
         updated_at      AS updated_datetime,
+
         '{{ modules.datetime.datetime.now(modules.pytz.timezone("Asia/Kuala_Lumpur")) }}' AS _dbt_ran_datetime
 
     FROM source
 
 ),
 
+
 -- FINAL
-final__base_exchange__vouchers AS (
+final__stg_exchange__vouchers AS (
 
     SELECT
         -- ids
@@ -32,11 +36,14 @@ final__base_exchange__vouchers AS (
         name,
         code,
         type,
-        voucher_credit,
+        credit_type,
 
         -- measures
+        voucher_credit,
 
         -- date/times
+        voucher_start_datetime,
+        voucher_end_datetime
         created_datetime,
         updated_datetime,
 
@@ -47,4 +54,4 @@ final__base_exchange__vouchers AS (
 
 )
 
-SELECT * FROM final__base_exchange__vouchers
+SELECT * FROM final__stg_exchange__vouchers