diff --git a/metrics/DevelopmentLifeCycle/ApprovedCommitAuthorEnforced/metric.rego b/metrics/DevelopmentLifeCycle/ApprovedCommitAuthorEnforced/metric.rego
index d74c6582..4cc59885 100644
--- a/metrics/DevelopmentLifeCycle/ApprovedCommitAuthorEnforced/metric.rego
+++ b/metrics/DevelopmentLifeCycle/ApprovedCommitAuthorEnforced/metric.rego
@@ -2,17 +2,15 @@ package cch.metrics.approved_commit_author_enforced
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
     "CodeRepository" in input.type
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.approvedCommitAuthorEnforced)
+    compare(data.operator, data.target_value, input.approvedCommitAuthorEnforced)
 }
diff --git a/metrics/DevelopmentLifeCycle/CodeSignoffEnforced/metric.rego b/metrics/DevelopmentLifeCycle/CodeSignoffEnforced/metric.rego
index 219fdca6..629b5137 100644
--- a/metrics/DevelopmentLifeCycle/CodeSignoffEnforced/metric.rego
+++ b/metrics/DevelopmentLifeCycle/CodeSignoffEnforced/metric.rego
@@ -2,18 +2,17 @@ package cch.metrics.code_signoff_enforced
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
+import input.codeSignoff as cs
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
+    cs
     "CodeRepository" in input.type
-    repo.codeSignoff
 }
 
 compliant if {
-	compare(data.operator, data.target_value, repo.codeSignoff.enforced)
+	compare(data.operator, data.target_value, cs.enforced)
 }
diff --git a/metrics/DevelopmentLifeCycle/CodeSignoffPercentage/metric.rego b/metrics/DevelopmentLifeCycle/CodeSignoffPercentage/metric.rego
index 3b2f3309..396a699a 100644
--- a/metrics/DevelopmentLifeCycle/CodeSignoffPercentage/metric.rego
+++ b/metrics/DevelopmentLifeCycle/CodeSignoffPercentage/metric.rego
@@ -2,18 +2,17 @@ package cch.metrics.code_signoff_percentage
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
+import input.codeSignoff as cs
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
+    cs
     "CodeRepository" in input.type
-    repo.codeSignoff
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.codeSignoff.percentage)
+    compare(data.operator, data.target_value, cs.percentage)
 }
diff --git a/metrics/DevelopmentLifeCycle/CodeSignoffPercentageLastMonth/metric.rego b/metrics/DevelopmentLifeCycle/CodeSignoffPercentageLastMonth/metric.rego
index 4be8f0a5..9712e39c 100644
--- a/metrics/DevelopmentLifeCycle/CodeSignoffPercentageLastMonth/metric.rego
+++ b/metrics/DevelopmentLifeCycle/CodeSignoffPercentageLastMonth/metric.rego
@@ -2,18 +2,17 @@ package cch.metrics.code_signoff_percentage_last_month
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
+import input.codeSignoff as cs
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
+    cs
     "CodeRepository" in input.type
-    repo.codeSignoff
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.codeSignoff.percentageLastMonth)
+    compare(data.operator, data.target_value, cs.percentageLastMonth)
 }
diff --git a/metrics/DevelopmentLifeCycle/PullRequestsWithReviewsPercentage/metric.rego b/metrics/DevelopmentLifeCycle/PullRequestsWithReviewsPercentage/metric.rego
index 981164c8..431c5489 100644
--- a/metrics/DevelopmentLifeCycle/PullRequestsWithReviewsPercentage/metric.rego
+++ b/metrics/DevelopmentLifeCycle/PullRequestsWithReviewsPercentage/metric.rego
@@ -2,17 +2,15 @@ package cch.metrics.pull_requests_with_reviews_percentage
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
     "CodeRepository" in input.type
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.reviewPercentage)
+    compare(data.operator, data.target_value, input.reviewPercentage)
 }
diff --git a/metrics/DevelopmentLifeCycle/PullRequestsWithReviewsPercentageLastMonth/metric.rego b/metrics/DevelopmentLifeCycle/PullRequestsWithReviewsPercentageLastMonth/metric.rego
index 810a3a3c..0b952500 100644
--- a/metrics/DevelopmentLifeCycle/PullRequestsWithReviewsPercentageLastMonth/metric.rego
+++ b/metrics/DevelopmentLifeCycle/PullRequestsWithReviewsPercentageLastMonth/metric.rego
@@ -2,17 +2,15 @@ package cch.metrics.pull_requests_with_reviews_percentage_last_month
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
     "CodeRepository" in input.type
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.reviewPercentageLastMonth)
+    compare(data.operator, data.target_value, input.reviewPercentageLastMonth)
 }
diff --git a/metrics/DevelopmentLifeCycle/RequiredReviewers/metric.rego b/metrics/DevelopmentLifeCycle/RequiredReviewers/metric.rego
index 498645a4..6529dfe4 100644
--- a/metrics/DevelopmentLifeCycle/RequiredReviewers/metric.rego
+++ b/metrics/DevelopmentLifeCycle/RequiredReviewers/metric.rego
@@ -2,17 +2,15 @@ package cch.metrics.required_reviewers
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as codeRepo
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    codeRepo
     "CodeRepository" in input.type
 }
 
 compliant if {
-    compare(data.operator, data.target_value, codeRepo.numberOfRequiredReviewers)
+    compare(data.operator, data.target_value, input.numberOfRequiredReviewers)
 }
diff --git a/metrics/DevelopmentLifeCycle/SignedCommitsEnforced/metric.rego b/metrics/DevelopmentLifeCycle/SignedCommitsEnforced/metric.rego
index 389f13df..7f757ed3 100644
--- a/metrics/DevelopmentLifeCycle/SignedCommitsEnforced/metric.rego
+++ b/metrics/DevelopmentLifeCycle/SignedCommitsEnforced/metric.rego
@@ -2,18 +2,17 @@ package cch.metrics.signed_commits_enforced
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
+import input.signedCommits as sc
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
+    sc
     "CodeRepository" in input.type
-    repo.signedCommits
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.signedCommits.enforced)
+    compare(data.operator, data.target_value, sc.enforced)
 }
diff --git a/metrics/DevelopmentLifeCycle/SignedCommitsPercentage/metric.rego b/metrics/DevelopmentLifeCycle/SignedCommitsPercentage/metric.rego
index 5cc93405..90b009e0 100644
--- a/metrics/DevelopmentLifeCycle/SignedCommitsPercentage/metric.rego
+++ b/metrics/DevelopmentLifeCycle/SignedCommitsPercentage/metric.rego
@@ -2,18 +2,17 @@ package cch.metrics.signed_commits_percentage
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
+import input.signedCommits as sc
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
+    sc
     "CodeRepository" in input.type
-    repo.signedCommits
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.signedCommits.percentage)
+    compare(data.operator, data.target_value, sc.percentage)
 }
diff --git a/metrics/DevelopmentLifeCycle/SignedCommitsPercentageLastMonth/metric.rego b/metrics/DevelopmentLifeCycle/SignedCommitsPercentageLastMonth/metric.rego
index 157852a4..7749e608 100644
--- a/metrics/DevelopmentLifeCycle/SignedCommitsPercentageLastMonth/metric.rego
+++ b/metrics/DevelopmentLifeCycle/SignedCommitsPercentageLastMonth/metric.rego
@@ -2,18 +2,17 @@ package cch.metrics.signed_commits_percentage_last_month
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
+import input.signedCommits as sc
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
+    sc
     "CodeRepository" in input.type
-    repo.signedCommits
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.signedCommits.percentageLastMonth)
+    compare(data.operator, data.target_value, sc.percentageLastMonth)
 }
diff --git a/metrics/DevelopmentLifeCycle/VerifiedCommitsPercentage/metric.rego b/metrics/DevelopmentLifeCycle/VerifiedCommitsPercentage/metric.rego
index a347139c..b5c468a2 100644
--- a/metrics/DevelopmentLifeCycle/VerifiedCommitsPercentage/metric.rego
+++ b/metrics/DevelopmentLifeCycle/VerifiedCommitsPercentage/metric.rego
@@ -2,18 +2,17 @@ package cch.metrics.verified_commits_percentage
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
+import input.verifiedCommits as vc
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
+    vc
     "CodeRepository" in input.type
-    repo.verifiedCommits
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.verifiedCommits.percentage)
+    compare(data.operator, data.target_value, vc.percentage)
 }
diff --git a/metrics/DevelopmentLifeCycle/VerifiedCommitsPercentageLastMonth/metric.rego b/metrics/DevelopmentLifeCycle/VerifiedCommitsPercentageLastMonth/metric.rego
index b06141e3..b36f4419 100644
--- a/metrics/DevelopmentLifeCycle/VerifiedCommitsPercentageLastMonth/metric.rego
+++ b/metrics/DevelopmentLifeCycle/VerifiedCommitsPercentageLastMonth/metric.rego
@@ -2,18 +2,17 @@ package cch.metrics.verified_commits_percentage_last_month
 
 import data.cch.compare
 import rego.v1
-import input.codeRepository as repo
+import input.verifiedCommits as vc
 
 default applicable = false
 
 default compliant = false
 
 applicable if {
-    repo
+    vc
     "CodeRepository" in input.type
-    repo.verifiedCommits
 }
 
 compliant if {
-    compare(data.operator, data.target_value, repo.verifiedCommits.percentageLastMonth)
+    compare(data.operator, data.target_value, vc.percentageLastMonth)
 }