diff --git a/src/hts/prep/queries/handlers/get-ct-prep-trends.handler.ts b/src/hts/prep/queries/handlers/get-ct-prep-trends.handler.ts
index 0387d4d9..9dcd6839 100644
--- a/src/hts/prep/queries/handlers/get-ct-prep-trends.handler.ts
+++ b/src/hts/prep/queries/handlers/get-ct-prep-trends.handler.ts
@@ -14,11 +14,11 @@ export class GetCTPrepTrendHandler implements IQueryHandler<GetCTPrepTrendQuery>
     async execute(query: GetCTPrepTrendQuery): Promise<any> {
         const params = [];
         let newOnPrep = `Select 
-            AssYear year,
-            AssMonth month,
+            Year year,
+            Month month,
             SUM(PrepCT) As PrepCT
         from AggregatePrepCascade prep
-        where AssYear is not null
+        where Year is not null
         `;
 
         if (query.county) {
diff --git a/src/hts/prep/queries/handlers/get-ct-prep.handler.ts b/src/hts/prep/queries/handlers/get-ct-prep.handler.ts
index d423129c..164c6fb1 100644
--- a/src/hts/prep/queries/handlers/get-ct-prep.handler.ts
+++ b/src/hts/prep/queries/handlers/get-ct-prep.handler.ts
@@ -16,7 +16,7 @@ export class GetCTPrepHandler implements IQueryHandler<GetCTPrepQuery> {
         let newOnPrep = `Select 
                     SUM(PrepCT) As PrepCT
                 from AggregatePrepCascade prep
-                where AssYear is not null
+                where Year is not null
         `;
 
         if (query.county) {
diff --git a/src/hts/prep/queries/handlers/get-new-on-prep-by-age-sex.handler.ts b/src/hts/prep/queries/handlers/get-new-on-prep-by-age-sex.handler.ts
index 226edfce..49ba3ee4 100644
--- a/src/hts/prep/queries/handlers/get-new-on-prep-by-age-sex.handler.ts
+++ b/src/hts/prep/queries/handlers/get-new-on-prep-by-age-sex.handler.ts
@@ -19,7 +19,7 @@ export class GetNewOnPrepByAgeSexHandler
                 Gender,
                 SUM(StartedPrep) As StartedPrep
             from AggregatePrepCascade prep
-            where AssYear is not null
+            where Year is not null
         `;
 
 
diff --git a/src/hts/prep/queries/handlers/get-new-on-prep-trends.handler.ts b/src/hts/prep/queries/handlers/get-new-on-prep-trends.handler.ts
index c26f6236..4647d338 100644
--- a/src/hts/prep/queries/handlers/get-new-on-prep-trends.handler.ts
+++ b/src/hts/prep/queries/handlers/get-new-on-prep-trends.handler.ts
@@ -19,7 +19,7 @@ export class GetNewOnPrepTrendsHandler
                 Year year,
                 SUM(StartedPrep) As StartedPrep
             from AggregatePrepCascade prep
-            where AssYear is not null
+            where Year is not null
         `;
 
         if (query.county) {
diff --git a/src/hts/prep/queries/handlers/get-new-on-prep.handler.ts b/src/hts/prep/queries/handlers/get-new-on-prep.handler.ts
index 5d329743..7da161ad 100644
--- a/src/hts/prep/queries/handlers/get-new-on-prep.handler.ts
+++ b/src/hts/prep/queries/handlers/get-new-on-prep.handler.ts
@@ -24,7 +24,7 @@ export class GetNewOnPrepHandler implements IQueryHandler<GetNewOnPrepQuery> {
                 Year VisitYear,
                 SUM(StartedPrep) As StartedPrep
             from AggregatePrepCascade prep
-            where AssYear is not null
+            where Year is not null
         `; 
 
         if (query.county) {
diff --git a/src/hts/prep/queries/handlers/get-prep-age-sex-trends.handler.ts b/src/hts/prep/queries/handlers/get-prep-age-sex-trends.handler.ts
index d59168be..7990f388 100644
--- a/src/hts/prep/queries/handlers/get-prep-age-sex-trends.handler.ts
+++ b/src/hts/prep/queries/handlers/get-prep-age-sex-trends.handler.ts
@@ -18,7 +18,7 @@ export class GetPrepAgeSexTrendHandler implements IQueryHandler<GetPrepAgeSexTre
             Gender,
             SUM(PrepCT) As PrepCT
         from AggregatePrepCascade prep
-        where Assyear is not null
+        where Year is not null
         `;
 
         if (query.county) {
diff --git a/src/hts/prep/queries/handlers/get-prep-eligible-by-agegroup.handler.ts b/src/hts/prep/queries/handlers/get-prep-eligible-by-agegroup.handler.ts
index ead02d92..37b14d82 100644
--- a/src/hts/prep/queries/handlers/get-prep-eligible-by-agegroup.handler.ts
+++ b/src/hts/prep/queries/handlers/get-prep-eligible-by-agegroup.handler.ts
@@ -18,7 +18,7 @@ export class GetPrepEligibleByAgegroupHandler
                 AgeGroup DATIMAgeGroup,
                 Sum(EligiblePrep) As EligiblePrep
             from AggregatePrepCascade prep
-            where AssYear is not null
+            where Year is not null
         `;
 
         if (query.county) {
diff --git a/src/hts/prep/queries/handlers/get-prep-eligible-trends.handler.ts b/src/hts/prep/queries/handlers/get-prep-eligible-trends.handler.ts
index 36fb77a7..95eb005a 100644
--- a/src/hts/prep/queries/handlers/get-prep-eligible-trends.handler.ts
+++ b/src/hts/prep/queries/handlers/get-prep-eligible-trends.handler.ts
@@ -15,11 +15,11 @@ export class GetPrepEligibleTrendsHandler
     async execute(query: GetPrepEligibleTrendsQuery): Promise<any> {
         const params = [];
         let newOnPrep = `SELECT
-                AssMonth month,
-                AssYear year,
+                Month month,
+                Year year,
                 Sum(EligiblePrep) As EligiblePrep
             from AggregatePrepCascade prep
-            where AssYear is not null
+            where Year is not null
         `;
 
         if (query.county) {
diff --git a/src/hts/prep/queries/handlers/get-prep-screened-trends.handler.ts b/src/hts/prep/queries/handlers/get-prep-screened-trends.handler.ts
index 8a5dad9d..71d88f46 100644
--- a/src/hts/prep/queries/handlers/get-prep-screened-trends.handler.ts
+++ b/src/hts/prep/queries/handlers/get-prep-screened-trends.handler.ts
@@ -19,7 +19,7 @@ export class GetPrepScreenedTrendsHandler
                 Year year,
                 Sum([Screened]) As ScreenedPrep
             from AggregatePrepCascade prep
-            where AssYear is not null
+            where Year is not null
         `;
 
         if (query.county) {