Repository: tfsec/tfsec
Pull request #440 (2020-10-16 11:23:42)

Rename test files


Patch:
diff --git a/internal/app/tfsec/checks/aws001.go b/internal/app/tfsec/checks/aws001.go
index 522119ad1..e056c9857 100644
--- a/internal/app/tfsec/checks/aws001.go
+++ b/internal/app/tfsec/checks/aws001.go
@@ -10,7 +10,7 @@ import (
 )
 
 // AWSBadBucketACL See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSBadBucketACL scanner.RuleID = "AWS001"
+const AWSBadBucketACL scanner.RuleCode = "AWS001"
 const AwsBadBucketACLDescription scanner.RuleSummary = "S3 Bucket has an ACL defined which allows public access."
 const AWSBadBucketACLExplanation = `
 S3 bucket permissions should be set to deny public access unless explicitly required.
diff --git a/internal/app/tfsec/checks/aws002.go b/internal/app/tfsec/checks/aws002.go
index ab911fb8b..9d68d5faa 100644
--- a/internal/app/tfsec/checks/aws002.go
+++ b/internal/app/tfsec/checks/aws002.go
@@ -9,7 +9,7 @@ import (
 )
 
 // AWSNoBucketLogging See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSNoBucketLogging scanner.RuleID = "AWS002"
+const AWSNoBucketLogging scanner.RuleCode = "AWS002"
 const AWSNoBucketLoggingDescription scanner.RuleSummary = "S3 Bucket does not have logging enabled."
 const AWSNoBucketLoggingExplanation = `
 Buckets should have logging enabled so that access can be audited. 
diff --git a/internal/app/tfsec/checks/aws003.go b/internal/app/tfsec/checks/aws003.go
index f199dac94..78df562e8 100644
--- a/internal/app/tfsec/checks/aws003.go
+++ b/internal/app/tfsec/checks/aws003.go
@@ -9,7 +9,7 @@ import (
 )
 
 // AWSClassicUsage See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSClassicUsage scanner.RuleID = "AWS003"
+const AWSClassicUsage scanner.RuleCode = "AWS003"
 const AWSClassicUsageDescription scanner.RuleSummary = "AWS Classic resource usage."
 const AWSClassicUsageExplanation = `
 AWS Classic resources run in a shared environment with infrastructure owned by other AWS customers. You should run
diff --git a/internal/app/tfsec/checks/aws004.go b/internal/app/tfsec/checks/aws004.go
index 30f90c5ef..d8fa3bf26 100644
--- a/internal/app/tfsec/checks/aws004.go
+++ b/internal/app/tfsec/checks/aws004.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSPlainHTTP See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSPlainHTTP scanner.RuleID = "AWS004"
+const AWSPlainHTTP scanner.RuleCode = "AWS004"
 const AWSPlainHTTPDescription scanner.RuleSummary = "Use of plain HTTP."
 const AWSPlainHTTPExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws005.go b/internal/app/tfsec/checks/aws005.go
index e3e05012d..f0e7434da 100644
--- a/internal/app/tfsec/checks/aws005.go
+++ b/internal/app/tfsec/checks/aws005.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSExternallyExposedLoadBalancer See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSExternallyExposedLoadBalancer scanner.RuleID = "AWS005"
+const AWSExternallyExposedLoadBalancer scanner.RuleCode = "AWS005"
 const AWSExternallyExposedLoadBalancerDescription scanner.RuleSummary = "Load balancer is exposed to the internet."
 const AWSExternallyExposedLoadBalancerExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws006.go b/internal/app/tfsec/checks/aws006.go
index 36f16ad84..d06ad7a96 100644
--- a/internal/app/tfsec/checks/aws006.go
+++ b/internal/app/tfsec/checks/aws006.go
@@ -12,7 +12,7 @@ import (
 )
 
 // AWSOpenIngressSecurityGroupRule See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSOpenIngressSecurityGroupRule scanner.RuleID = "AWS006"
+const AWSOpenIngressSecurityGroupRule scanner.RuleCode = "AWS006"
 const AWSOpenIngressSecurityGroupRuleDescription scanner.RuleSummary = "An ingress security group rule allows traffic from `/0`."
 const AWSOpenIngressSecurityGroupRuleExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws007.go b/internal/app/tfsec/checks/aws007.go
index ffa174312..5f8527aed 100644
--- a/internal/app/tfsec/checks/aws007.go
+++ b/internal/app/tfsec/checks/aws007.go
@@ -10,7 +10,7 @@ import (
 )
 
 // AWSOpenEgressSecurityGroupRule See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSOpenEgressSecurityGroupRule scanner.RuleID = "AWS007"
+const AWSOpenEgressSecurityGroupRule scanner.RuleCode = "AWS007"
 const AWSOpenEgressSecurityGroupRuleDescription scanner.RuleSummary = "An egress security group rule allows traffic to `/0`."
 
 func init() {
diff --git a/internal/app/tfsec/checks/aws008.go b/internal/app/tfsec/checks/aws008.go
index 1fc1a75a6..047e2b6bf 100644
--- a/internal/app/tfsec/checks/aws008.go
+++ b/internal/app/tfsec/checks/aws008.go
@@ -10,7 +10,7 @@ import (
 )
 
 // AWSOpenIngressSecurityGroupInlineRule See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSOpenIngressSecurityGroupInlineRule scanner.RuleID = "AWS008"
+const AWSOpenIngressSecurityGroupInlineRule scanner.RuleCode = "AWS008"
 const AWSOpenIngressSecurityGroupInlineRuleDescription scanner.RuleSummary = "An inline ingress security group rule allows traffic from `/0`."
 const AWSOpenIngressSecurityGroupInlineRuleExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws009.go b/internal/app/tfsec/checks/aws009.go
index 404bca22c..06c07bae0 100644
--- a/internal/app/tfsec/checks/aws009.go
+++ b/internal/app/tfsec/checks/aws009.go
@@ -9,7 +9,7 @@ import (
 )
 
 // AWSOpenEgressSecurityGroupInlineRule See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSOpenEgressSecurityGroupInlineRule scanner.RuleID = "AWS009"
+const AWSOpenEgressSecurityGroupInlineRule scanner.RuleCode = "AWS009"
 const AWSOpenEgressSecurityGroupInlineRuleDescription scanner.RuleSummary = "An inline egress security group rule allows traffic to `/0`."
 
 func init() {
diff --git a/internal/app/tfsec/checks/aws010.go b/internal/app/tfsec/checks/aws010.go
index 134597b0e..62c480aee 100644
--- a/internal/app/tfsec/checks/aws010.go
+++ b/internal/app/tfsec/checks/aws010.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSOutdatedSSLPolicy See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSOutdatedSSLPolicy scanner.RuleID = "AWS010"
+const AWSOutdatedSSLPolicy scanner.RuleCode = "AWS010"
 const AWSOutdatedSSLPolicyDescription scanner.RuleSummary = "An outdated SSL policy is in use by a load balancer."
 const AWSOutdatedSSLPolicyExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws011.go b/internal/app/tfsec/checks/aws011.go
index 7ddd1c64d..bea94a9cc 100644
--- a/internal/app/tfsec/checks/aws011.go
+++ b/internal/app/tfsec/checks/aws011.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSPubliclyAccessibleResource See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSPubliclyAccessibleResource scanner.RuleID = "AWS011"
+const AWSPubliclyAccessibleResource scanner.RuleCode = "AWS011"
 const AWSPubliclyAccessibleResourceDescription scanner.RuleSummary = "A resource is marked as publicly accessible."
 const AWSPubliclyAccessibleResourceExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws012.go b/internal/app/tfsec/checks/aws012.go
index 10a1df617..d08cc87b9 100644
--- a/internal/app/tfsec/checks/aws012.go
+++ b/internal/app/tfsec/checks/aws012.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSResourceHasPublicIP See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSResourceHasPublicIP scanner.RuleID = "AWS012"
+const AWSResourceHasPublicIP scanner.RuleCode = "AWS012"
 const AWSResourceHasPublicIPDescription scanner.RuleSummary = "A resource has a public IP address."
 const AWSResourceHasPublicIPExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws013.go b/internal/app/tfsec/checks/aws013.go
index db731e64e..4d76cbbbd 100644
--- a/internal/app/tfsec/checks/aws013.go
+++ b/internal/app/tfsec/checks/aws013.go
@@ -14,7 +14,7 @@ import (
 )
 
 // AWSTaskDefinitionWithSensitiveEnvironmentVariables See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSTaskDefinitionWithSensitiveEnvironmentVariables scanner.RuleID = "AWS013"
+const AWSTaskDefinitionWithSensitiveEnvironmentVariables scanner.RuleCode = "AWS013"
 const AWSTaskDefinitionWithSensitiveEnvironmentVariablesDescription scanner.RuleSummary = "Task definition defines sensitive environment variable(s)."
 const AWSTaskDefinitionWithSensitiveEnvironmentVariablesExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws014.go b/internal/app/tfsec/checks/aws014.go
index 457baa7ab..6dd83316d 100644
--- a/internal/app/tfsec/checks/aws014.go
+++ b/internal/app/tfsec/checks/aws014.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSLaunchConfigurationWithUnencryptedBlockDevice See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSLaunchConfigurationWithUnencryptedBlockDevice scanner.RuleID = "AWS014"
+const AWSLaunchConfigurationWithUnencryptedBlockDevice scanner.RuleCode = "AWS014"
 const AWSLaunchConfigurationWithUnencryptedBlockDeviceDescription scanner.RuleSummary = "Launch configuration with unencrypted block device."
 const AWSLaunchConfigurationWithUnencryptedBlockDeviceExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws015.go b/internal/app/tfsec/checks/aws015.go
index 1f5c27673..b640e76ff 100644
--- a/internal/app/tfsec/checks/aws015.go
+++ b/internal/app/tfsec/checks/aws015.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSUnencryptedSQSQueue See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnencryptedSQSQueue scanner.RuleID = "AWS015"
+const AWSUnencryptedSQSQueue scanner.RuleCode = "AWS015"
 const AWSUnencryptedSQSQueueDescription scanner.RuleSummary = "Unencrypted SQS queue."
 const AWSUnencryptedSQSQueueExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws016.go b/internal/app/tfsec/checks/aws016.go
index d471ce474..f00a59ba2 100644
--- a/internal/app/tfsec/checks/aws016.go
+++ b/internal/app/tfsec/checks/aws016.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSUnencryptedSNSTopic See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnencryptedSNSTopic scanner.RuleID = "AWS016"
+const AWSUnencryptedSNSTopic scanner.RuleCode = "AWS016"
 const AWSUnencryptedSNSTopicDescription scanner.RuleSummary = "Unencrypted SNS topic."
 const AWSUnencryptedSNSTopicExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws017.go b/internal/app/tfsec/checks/aws017.go
index 2312e1b00..32b5b0830 100644
--- a/internal/app/tfsec/checks/aws017.go
+++ b/internal/app/tfsec/checks/aws017.go
@@ -9,7 +9,7 @@ import (
 )
 
 // AWSUnencryptedS3Bucket See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnencryptedS3Bucket scanner.RuleID = "AWS017"
+const AWSUnencryptedS3Bucket scanner.RuleCode = "AWS017"
 const AWSUnencryptedS3BucketDescription scanner.RuleSummary = "Unencrypted S3 bucket."
 const AWSUnencryptedS3BucketExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws018.go b/internal/app/tfsec/checks/aws018.go
index 95512031e..dc3d2b987 100644
--- a/internal/app/tfsec/checks/aws018.go
+++ b/internal/app/tfsec/checks/aws018.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSNoDescriptionInSecurityGroup See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSNoDescriptionInSecurityGroup scanner.RuleID = "AWS018"
+const AWSNoDescriptionInSecurityGroup scanner.RuleCode = "AWS018"
 const AWSNoDescriptionInSecurityGroupDescription scanner.RuleSummary = "Missing description for security group/security group rule."
 const AWSNoInSecurityGroupExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws019.go b/internal/app/tfsec/checks/aws019.go
index be53ef88e..361df4c16 100644
--- a/internal/app/tfsec/checks/aws019.go
+++ b/internal/app/tfsec/checks/aws019.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSNoKMSAutoRotate See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSNoKMSAutoRotate scanner.RuleID = "AWS019"
+const AWSNoKMSAutoRotate scanner.RuleCode = "AWS019"
 const AWSNoKMSAutoRotateDescription scanner.RuleSummary = "A KMS key is not configured to auto-rotate."
 const AWSNoKMSAutoRotateExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws020.go b/internal/app/tfsec/checks/aws020.go
index 7e4c5315b..f006fcf91 100644
--- a/internal/app/tfsec/checks/aws020.go
+++ b/internal/app/tfsec/checks/aws020.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSUnencryptedCloudFrontCommunications See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnencryptedCloudFrontCommunications scanner.RuleID = "AWS020"
+const AWSUnencryptedCloudFrontCommunications scanner.RuleCode = "AWS020"
 const AWSUnencryptedCloudFrontCommunicationsDescription scanner.RuleSummary = "CloudFront distribution allows unencrypted (HTTP) communications."
 const AWSUnencryptedCloudFrontCommunicationsExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws021.go b/internal/app/tfsec/checks/aws021.go
index 92ed577f1..daccb742b 100644
--- a/internal/app/tfsec/checks/aws021.go
+++ b/internal/app/tfsec/checks/aws021.go
@@ -10,7 +10,7 @@ import (
 )
 
 // AWSCloudFrontOutdatedProtocol See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSCloudFrontOutdatedProtocol scanner.RuleID = "AWS021"
+const AWSCloudFrontOutdatedProtocol scanner.RuleCode = "AWS021"
 const AWSCloudFrontOutdatedProtocolDescription scanner.RuleSummary = "CloudFront distribution uses outdated SSL/TSL protocols."
 const AWSCloudFrontOutdatedProtocolExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws022.go b/internal/app/tfsec/checks/aws022.go
index 691988936..470e0a938 100644
--- a/internal/app/tfsec/checks/aws022.go
+++ b/internal/app/tfsec/checks/aws022.go
@@ -9,7 +9,7 @@ import (
 )
 
 // AWSUnencryptedMSKBroker See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnencryptedMSKBroker scanner.RuleID = "AWS022"
+const AWSUnencryptedMSKBroker scanner.RuleCode = "AWS022"
 const AWSUnencryptedMSKBrokerDescription scanner.RuleSummary = "A MSK cluster allows unencrypted data in transit."
 const AWSUnencryptedMSKBrokerExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws023.go b/internal/app/tfsec/checks/aws023.go
index 26dcfa38d..f7e1cf16c 100644
--- a/internal/app/tfsec/checks/aws023.go
+++ b/internal/app/tfsec/checks/aws023.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSEcrImageScanNotEnabled See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSEcrImageScanNotEnabled scanner.RuleID = "AWS023"
+const AWSEcrImageScanNotEnabled scanner.RuleCode = "AWS023"
 const AWSEcrImageScanNotEnabledDescription scanner.RuleSummary = "ECR repository has image scans disabled."
 const AWSEcrImageScanNotEnabledExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws024.go b/internal/app/tfsec/checks/aws024.go
index 954d49c74..f73df6b1a 100644
--- a/internal/app/tfsec/checks/aws024.go
+++ b/internal/app/tfsec/checks/aws024.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSUnencryptedKinesisStream See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnencryptedKinesisStream scanner.RuleID = "AWS024"
+const AWSUnencryptedKinesisStream scanner.RuleCode = "AWS024"
 const AWSUnencryptedKinesisStreamDescription scanner.RuleSummary = "Kinesis stream is unencrypted."
 const AWSUnencryptedKinesisStreamExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws025.go b/internal/app/tfsec/checks/aws025.go
index 5c9c3f791..f3df19db5 100644
--- a/internal/app/tfsec/checks/aws025.go
+++ b/internal/app/tfsec/checks/aws025.go
@@ -10,7 +10,7 @@ import (
 )
 
 // AWSApiGatewayDomainNameOutdatedSecurityPolicy See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSApiGatewayDomainNameOutdatedSecurityPolicy scanner.RuleID = "AWS025"
+const AWSApiGatewayDomainNameOutdatedSecurityPolicy scanner.RuleCode = "AWS025"
 const AWSApiGatewayDomainNameOutdatedSecurityPolicyDescription scanner.RuleSummary = "API Gateway domain name uses outdated SSL/TLS protocols."
 const AWSApiGatewayDomainNameOutdatedSecurityPolicyExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws031.go b/internal/app/tfsec/checks/aws031.go
index ec79eda6a..86904c6f9 100644
--- a/internal/app/tfsec/checks/aws031.go
+++ b/internal/app/tfsec/checks/aws031.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSUnencryptedElasticsearchDomain See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnencryptedElasticsearchDomain scanner.RuleID = "AWS031"
+const AWSUnencryptedElasticsearchDomain scanner.RuleCode = "AWS031"
 const AWSUnencryptedElasticsearchDomainDescription scanner.RuleSummary = "Elasticsearch domain isn't encrypted at rest."
 const AWSUnencryptedElasticsearchDomainExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws032.go b/internal/app/tfsec/checks/aws032.go
index d74204c0a..69bcc38f7 100644
--- a/internal/app/tfsec/checks/aws032.go
+++ b/internal/app/tfsec/checks/aws032.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSPlaintextNodeToNodeElasticsearchTraffic See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSPlaintextNodeToNodeElasticsearchTraffic scanner.RuleID = "AWS032"
+const AWSPlaintextNodeToNodeElasticsearchTraffic scanner.RuleCode = "AWS032"
 const AWSPlaintextNodeToNodeElasticsearchTrafficDescription scanner.RuleSummary = "Elasticsearch domain uses plaintext traffic for node to node communication."
 const AWSPlaintextNodeToNodeElasticsearchTrafficExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws033.go b/internal/app/tfsec/checks/aws033.go
index 10e19e8bd..67bb6f801 100644
--- a/internal/app/tfsec/checks/aws033.go
+++ b/internal/app/tfsec/checks/aws033.go
@@ -12,7 +12,7 @@ import (
 
 // AWSUnenforcedHTTPSElasticsearchDomainEndpoint See
 // https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnenforcedHTTPSElasticsearchDomainEndpoint scanner.RuleID = "AWS033"
+const AWSUnenforcedHTTPSElasticsearchDomainEndpoint scanner.RuleCode = "AWS033"
 const AWSUnenforcedHTTPSElasticsearchDomainEndpointDescription scanner.RuleSummary = "Elasticsearch doesn't enforce HTTPS traffic."
 const AWSUnenforcedHTTPSElasticsearchDomainEndpointExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws034.go b/internal/app/tfsec/checks/aws034.go
index 0fe4dc16f..19a39daa8 100644
--- a/internal/app/tfsec/checks/aws034.go
+++ b/internal/app/tfsec/checks/aws034.go
@@ -12,7 +12,7 @@ import (
 
 // AWSOutdatedTLSPolicyElasticsearchDomainEndpoint See
 // https://github.com/tfsec/tfsec#included-checks for check info
-const AWSOutdatedTLSPolicyElasticsearchDomainEndpoint scanner.RuleID = "AWS034"
+const AWSOutdatedTLSPolicyElasticsearchDomainEndpoint scanner.RuleCode = "AWS034"
 const AWSOutdatedTLSPolicyElasticsearchDomainEndpointDescription scanner.RuleSummary = "Elasticsearch domain endpoint is using outdated TLS policy."
 const AWSOutdatedTLSPolicyElasticsearchDomainEndpointExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws035.go b/internal/app/tfsec/checks/aws035.go
index be93a894f..9f8ca7d06 100644
--- a/internal/app/tfsec/checks/aws035.go
+++ b/internal/app/tfsec/checks/aws035.go
@@ -9,7 +9,7 @@ import (
 )
 
 // AWSUnencryptedAtRestElasticacheReplicationGroup See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnencryptedAtRestElasticacheReplicationGroup scanner.RuleID = "AWS035"
+const AWSUnencryptedAtRestElasticacheReplicationGroup scanner.RuleCode = "AWS035"
 const AWSUnencryptedAtRestElasticacheReplicationGroupDescription scanner.RuleSummary = "Unencrypted Elasticache Replication Group."
 const AWSUnencryptedAtRestElasticacheReplicationGroupExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws036.go b/internal/app/tfsec/checks/aws036.go
index cdbb9d724..369a835c7 100644
--- a/internal/app/tfsec/checks/aws036.go
+++ b/internal/app/tfsec/checks/aws036.go
@@ -9,7 +9,7 @@ import (
 )
 
 // AWSUnencryptedInTransitElasticacheReplicationGroup See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSUnencryptedInTransitElasticacheReplicationGroup scanner.RuleID = "AWS036"
+const AWSUnencryptedInTransitElasticacheReplicationGroup scanner.RuleCode = "AWS036"
 const AWSUnencryptedInTransitElasticacheReplicationGroupDescription scanner.RuleSummary = "Elasticache Replication Group uses unencrypted traffic."
 const AWSUnencryptedInTransitElasticacheReplicationGroupExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws037.go b/internal/app/tfsec/checks/aws037.go
index 09e6e13f8..f9d91219b 100644
--- a/internal/app/tfsec/checks/aws037.go
+++ b/internal/app/tfsec/checks/aws037.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	AWSIAMPasswordReusePrevention            scanner.RuleID      = "AWS037"
+	AWSIAMPasswordReusePrevention            scanner.RuleCode    = "AWS037"
 	AWSIAMPasswordReusePreventionDescription scanner.RuleSummary = "IAM Password policy should prevent password reuse."
 
 	AWSIAMPasswordReusePreventionExplanation = `
diff --git a/internal/app/tfsec/checks/aws038.go b/internal/app/tfsec/checks/aws038.go
index 66410e25a..0cee51927 100644
--- a/internal/app/tfsec/checks/aws038.go
+++ b/internal/app/tfsec/checks/aws038.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	AWSIAMPasswordExpiry            scanner.RuleID      = "AWS038"
+	AWSIAMPasswordExpiry            scanner.RuleCode    = "AWS038"
 	AWSIAMPasswordExpiryDescription scanner.RuleSummary = "IAM Password policy should have expiry less than or equal to 90 days."
 
 	AWSIAMPasswordExpiryExplanation = `
diff --git a/internal/app/tfsec/checks/aws039.go b/internal/app/tfsec/checks/aws039.go
index 43b1a5bf6..566b91862 100644
--- a/internal/app/tfsec/checks/aws039.go
+++ b/internal/app/tfsec/checks/aws039.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	AWSIAMPasswordMinimumLength            scanner.RuleID      = "AWS039"
+	AWSIAMPasswordMinimumLength            scanner.RuleCode    = "AWS039"
 	AWSIAMPasswordMinimumLengthDescription scanner.RuleSummary = "IAM Password policy should have minimum password length of 14 or more characters."
 
 	AWSIAMPasswordMinimumLengthExplanation = `
diff --git a/internal/app/tfsec/checks/aws040.go b/internal/app/tfsec/checks/aws040.go
index 31c350eba..f4ce4d13c 100644
--- a/internal/app/tfsec/checks/aws040.go
+++ b/internal/app/tfsec/checks/aws040.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	AWSIAMPasswordRequiresSymbol            scanner.RuleID      = "AWS040"
+	AWSIAMPasswordRequiresSymbol            scanner.RuleCode    = "AWS040"
 	AWSIAMPasswordRequiresSymbolDescription scanner.RuleSummary = "IAM Password policy should have requirement for at least one symbol in the password."
 
 	AWSIAMPasswordRequiresSymbolExplanation = `
diff --git a/internal/app/tfsec/checks/aws041.go b/internal/app/tfsec/checks/aws041.go
index 9af858173..2aac9b28d 100644
--- a/internal/app/tfsec/checks/aws041.go
+++ b/internal/app/tfsec/checks/aws041.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	AWSIAMPasswordRequiresNumber            scanner.RuleID      = "AWS041"
+	AWSIAMPasswordRequiresNumber            scanner.RuleCode    = "AWS041"
 	AWSIAMPasswordRequiresNumberDescription scanner.RuleSummary = "IAM Password policy should have requirement for at least one number in the password."
 
 	AWSIAMPasswordRequiresNumberExplanation = `
diff --git a/internal/app/tfsec/checks/aws042.go b/internal/app/tfsec/checks/aws042.go
index 0933363a0..f8a536333 100644
--- a/internal/app/tfsec/checks/aws042.go
+++ b/internal/app/tfsec/checks/aws042.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	AWSIAMPasswordRequiresLowercaseCharacter            scanner.RuleID      = "AWS042"
+	AWSIAMPasswordRequiresLowercaseCharacter            scanner.RuleCode    = "AWS042"
 	AWSIAMPasswordRequiresLowercaseCharacterDescription scanner.RuleSummary = "IAM Password policy should have requirement for at least one lowercase character."
 
 	AWSIAMPasswordRequiresLowercaseCharacterExplanation = `
diff --git a/internal/app/tfsec/checks/aws043.go b/internal/app/tfsec/checks/aws043.go
index c8de32949..198f5cfad 100644
--- a/internal/app/tfsec/checks/aws043.go
+++ b/internal/app/tfsec/checks/aws043.go
@@ -10,7 +10,7 @@ import (
 
 // AWSIAMPasswordRequiresUppercaseCharacter See https://github.com/tfsec/tfsec#included-checks for check info
 const (
-	AWSIAMPasswordRequiresUppercaseCharacter            scanner.RuleID      = "AWS043"
+	AWSIAMPasswordRequiresUppercaseCharacter            scanner.RuleCode    = "AWS043"
 	AWSIAMPasswordRequiresUppercaseCharacterDescription scanner.RuleSummary = "IAM Password policy should have requirement for at least one uppercase character."
 
 	AWSIAMPasswordRequiresUppercaseCharacterExplanation = `
diff --git a/internal/app/tfsec/checks/aws044.go b/internal/app/tfsec/checks/aws044.go
index 47021f097..2e7b9fd6b 100644
--- a/internal/app/tfsec/checks/aws044.go
+++ b/internal/app/tfsec/checks/aws044.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AWSProviderHasAccessCredentials See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSProviderHasAccessCredentials scanner.RuleID = "AWS044"
+const AWSProviderHasAccessCredentials scanner.RuleCode = "AWS044"
 const AWSProviderHasAccessCredentialsDescription scanner.RuleSummary = "AWS provider has access credentials specified."
 const AWSProviderHasAccessCredentialsExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws045.go b/internal/app/tfsec/checks/aws045.go
index 37f8ae00c..2f0fc2ee0 100644
--- a/internal/app/tfsec/checks/aws045.go
+++ b/internal/app/tfsec/checks/aws045.go
@@ -8,7 +8,7 @@ import (
 )
 
 // AWSCloudFrontDoesNotHaveAWaf See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSCloudFrontDoesNotHaveAWaf scanner.RuleID = "AWS045"
+const AWSCloudFrontDoesNotHaveAWaf scanner.RuleCode = "AWS045"
 const AWSCloudFrontDoesNotHaveAWafDescription scanner.RuleSummary = "CloudFront distribution does not have a WAF in front."
 const AWSCloudFrontDoesNotHaveAWafExplanation = `
 
diff --git a/internal/app/tfsec/checks/aws046.go b/internal/app/tfsec/checks/aws046.go
index 3f6a3336d..edecc1b6a 100644
--- a/internal/app/tfsec/checks/aws046.go
+++ b/internal/app/tfsec/checks/aws046.go
@@ -9,7 +9,7 @@ import (
 )
 
 // AWSIamPolicyWildcardActions See https://github.com/tfsec/tfsec#included-checks for check info
-const AWSIamPolicyWildcardActions scanner.RuleID = "AWS046"
+const AWSIamPolicyWildcardActions scanner.RuleCode = "AWS046"
 const AWSIamPolicyWildcardActionsDescription scanner.RuleSummary = "AWS IAM policy document has wildcard action statement."
 const AWSIamPolicyWildcardActionsExplanation = `
 
diff --git a/internal/app/tfsec/checks/azu001.go b/internal/app/tfsec/checks/azu001.go
index bdae466d1..ee22f6c97 100644
--- a/internal/app/tfsec/checks/azu001.go
+++ b/internal/app/tfsec/checks/azu001.go
@@ -12,7 +12,7 @@ import (
 )
 
 // AzureOpenInboundNetworkSecurityGroupRule See https://github.com/tfsec/tfsec#included-checks for check info
-const AzureOpenInboundNetworkSecurityGroupRule scanner.RuleID = "AZU001"
+const AzureOpenInboundNetworkSecurityGroupRule scanner.RuleCode = "AZU001"
 const AzureOpenInboundNetworkSecurityGroupRuleDescription scanner.RuleSummary = "An inbound network security rule allows traffic from `/0`."
 const AzureOpenInboundNetworkSecurityGroupRuleExplanation = `
 Network security rules should not use very broad subnets.
diff --git a/internal/app/tfsec/checks/azu002.go b/internal/app/tfsec/checks/azu002.go
index a18e4afeb..4bf33bddc 100644
--- a/internal/app/tfsec/checks/azu002.go
+++ b/internal/app/tfsec/checks/azu002.go
@@ -9,7 +9,7 @@ import (
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
-const AzureOpenOutboundNetworkSecurityGroupRule scanner.RuleID = "AZU002"
+const AzureOpenOutboundNetworkSecurityGroupRule scanner.RuleCode = "AZU002"
 const AzureOpenOutboundNetworkSecurityGroupRuleDescription scanner.RuleSummary = "An outbound network security rule allows traffic to `/0`."
 const AzureOpenOutboundNetworkSecurityGroupRuleExplanation = `
 Network security rules should not use very broad subnets.
diff --git a/internal/app/tfsec/checks/azu003.go b/internal/app/tfsec/checks/azu003.go
index 74f94d82a..0e4e80ea1 100644
--- a/internal/app/tfsec/checks/azu003.go
+++ b/internal/app/tfsec/checks/azu003.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AzureUnencryptedManagedDisk See https://github.com/tfsec/tfsec#included-checks for check info
-const AzureUnencryptedManagedDisk scanner.RuleID = "AZU003"
+const AzureUnencryptedManagedDisk scanner.RuleCode = "AZU003"
 const AzureUnencryptedManagedDiskDescription scanner.RuleSummary = "Unencrypted managed disk."
 const AzureUnencryptedManagedDiskExplanation = `
 Manage disks should be encrypted at rest
diff --git a/internal/app/tfsec/checks/azu004.go b/internal/app/tfsec/checks/azu004.go
index 167a82635..0889d408e 100644
--- a/internal/app/tfsec/checks/azu004.go
+++ b/internal/app/tfsec/checks/azu004.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AzureUnencryptedDataLakeStore See https://github.com/tfsec/tfsec#included-checks for check info
-const AzureUnencryptedDataLakeStore scanner.RuleID = "AZU004"
+const AzureUnencryptedDataLakeStore scanner.RuleCode = "AZU004"
 const AzureUnencryptedDataLakeStoreDescription scanner.RuleSummary = "Unencrypted data lake storage."
 const AzureUnencryptedDataLakeStoreExplanation = `
 Datalake storage encryption defaults to Enabled, it shouldn't be overridden to Disabled.
diff --git a/internal/app/tfsec/checks/azu005.go b/internal/app/tfsec/checks/azu005.go
index d8da0c232..dd0b85336 100644
--- a/internal/app/tfsec/checks/azu005.go
+++ b/internal/app/tfsec/checks/azu005.go
@@ -11,7 +11,7 @@ import (
 )
 
 // AzureVMWithPasswordAuthentication See https://github.com/tfsec/tfsec#included-checks for check info
-const AzureVMWithPasswordAuthentication scanner.RuleID = "AZU005"
+const AzureVMWithPasswordAuthentication scanner.RuleCode = "AZU005"
 const AzureVMWithPasswordAuthenticationDescription scanner.RuleSummary = "Password authentication in use instead of SSH keys."
 const AzureVMWithPasswordAuthenticationExplanation = `
 Access to instances should be authenticated using SSH keys. Removing the option of password authentication enforces more secure methods while removing the risks inherent with passwords.
diff --git a/internal/app/tfsec/checks/gcp001.go b/internal/app/tfsec/checks/gcp001.go
index f309365cc..b5568fee3 100644
--- a/internal/app/tfsec/checks/gcp001.go
+++ b/internal/app/tfsec/checks/gcp001.go
@@ -8,7 +8,7 @@ import (
 )
 
 // GoogleUnencryptedDisk See https://github.com/tfsec/tfsec#included-checks for check info
-const GoogleUnencryptedDisk scanner.RuleID = "GCP001"
+const GoogleUnencryptedDisk scanner.RuleCode = "GCP001"
 const GoogleUnencryptedDiskDescription scanner.RuleSummary = "Unencrypted compute disk."
 const GoogleUnencryptedDiskExplanation = `
 
diff --git a/internal/app/tfsec/checks/gcp002.go b/internal/app/tfsec/checks/gcp002.go
index 04e5c9185..2d610e0fc 100644
--- a/internal/app/tfsec/checks/gcp002.go
+++ b/internal/app/tfsec/checks/gcp002.go
@@ -8,7 +8,7 @@ import (
 )
 
 // GoogleUnencryptedStorageBucket See https://github.com/tfsec/tfsec#included-checks for check info
-const GoogleUnencryptedStorageBucket scanner.RuleID = "GCP002"
+const GoogleUnencryptedStorageBucket scanner.RuleCode = "GCP002"
 const GoogleUnencryptedStorageBucketDescription scanner.RuleSummary = "Unencrypted storage bucket."
 const GoogleUnencryptedStorageBucketExplanation = `
 
diff --git a/internal/app/tfsec/checks/gcp003.go b/internal/app/tfsec/checks/gcp003.go
index 00e40aa9a..429373c3a 100644
--- a/internal/app/tfsec/checks/gcp003.go
+++ b/internal/app/tfsec/checks/gcp003.go
@@ -10,7 +10,7 @@ import (
 )
 
 // GoogleOpenInboundFirewallRule See https://github.com/tfsec/tfsec#included-checks for check info
-const GoogleOpenInboundFirewallRule scanner.RuleID = "GCP003"
+const GoogleOpenInboundFirewallRule scanner.RuleCode = "GCP003"
 const GoogleOpenInboundFirewallRuleDescription scanner.RuleSummary = "An inbound firewall rule allows traffic from `/0`."
 const GoogleOpenInboundFirewallRuleExplanation = `
 
diff --git a/internal/app/tfsec/checks/gcp004.go b/internal/app/tfsec/checks/gcp004.go
index 97cf9c264..fd8d06acc 100644
--- a/internal/app/tfsec/checks/gcp004.go
+++ b/internal/app/tfsec/checks/gcp004.go
@@ -9,7 +9,7 @@ import (
 )
 
 // GoogleOpenOutboundFirewallRule See https://github.com/tfsec/tfsec#included-checks for check info
-const GoogleOpenOutboundFirewallRule scanner.RuleID = "GCP004"
+const GoogleOpenOutboundFirewallRule scanner.RuleCode = "GCP004"
 const GoogleOpenOutboundFirewallRuleDescription scanner.RuleSummary = "An outbound firewall rule allows traffic to `/0`."
 
 func init() {
diff --git a/internal/app/tfsec/checks/gcp005.go b/internal/app/tfsec/checks/gcp005.go
index 3a48842eb..2e3cab64b 100644
--- a/internal/app/tfsec/checks/gcp005.go
+++ b/internal/app/tfsec/checks/gcp005.go
@@ -8,7 +8,7 @@ import (
 )
 
 // GkeAbacEnabled See https://github.com/tfsec/tfsec#included-checks for check info
-const GkeAbacEnabled scanner.RuleID = "GCP005"
+const GkeAbacEnabled scanner.RuleCode = "GCP005"
 const GkeAbacEnabledDescription scanner.RuleSummary = "Legacy ABAC permissions are enabled."
 const GkeAbacEnabledExplanation = `
 
diff --git a/internal/app/tfsec/checks/gcp006.go b/internal/app/tfsec/checks/gcp006.go
index 6c91b0834..267292259 100644
--- a/internal/app/tfsec/checks/gcp006.go
+++ b/internal/app/tfsec/checks/gcp006.go
@@ -11,7 +11,7 @@ import (
 )
 
 // GkeNodeMetadataExposed See https://github.com/tfsec/tfsec#included-checks for check info
-const GkeNodeMetadataExposed scanner.RuleID = "GCP006"
+const GkeNodeMetadataExposed scanner.RuleCode = "GCP006"
 const GkeNodeMetadataExposedDescription scanner.RuleSummary = "Node metadata value disables metadata concealment."
 const GkeNodeMetadataExposedExplanation = `
 
diff --git a/internal/app/tfsec/checks/gcp007.go b/internal/app/tfsec/checks/gcp007.go
index 46ed2a1a7..d91a4939f 100644
--- a/internal/app/tfsec/checks/gcp007.go
+++ b/internal/app/tfsec/checks/gcp007.go
@@ -11,7 +11,7 @@ import (
 )
 
 // GkeLegacyMetadataEndpoints See https://github.com/tfsec/tfsec#included-checks for check info
-const GkeLegacyMetadataEndpoints scanner.RuleID = "GCP007"
+const GkeLegacyMetadataEndpoints scanner.RuleCode = "GCP007"
 const GkeLegacyMetadataEndpointsDescription scanner.RuleSummary = "Legacy metadata endpoints enabled."
 const GkeLegacyMetadataEndpointsExplanation = `
 
diff --git a/internal/app/tfsec/checks/gcp008.go b/internal/app/tfsec/checks/gcp008.go
index 52e8bb46f..740bb65a0 100644
--- a/internal/app/tfsec/checks/gcp008.go
+++ b/internal/app/tfsec/checks/gcp008.go
@@ -11,7 +11,7 @@ import (
 )
 
 // GkeLegacyAuthEnabled See https://github.com/tfsec/tfsec#included-checks for check info
-const GkeLegacyAuthEnabled scanner.RuleID = "GCP008"
+const GkeLegacyAuthEnabled scanner.RuleCode = "GCP008"
 const GkeLegacyAuthEnabledDescription scanner.RuleSummary = "Legacy client authentication methods utilized."
 const GkeLegacyAuthEnabledExplanation = `
 
diff --git a/internal/app/tfsec/checks/gcp009.go b/internal/app/tfsec/checks/gcp009.go
index 1da0fd5cc..8fbf6c8b8 100644
--- a/internal/app/tfsec/checks/gcp009.go
+++ b/internal/app/tfsec/checks/gcp009.go
@@ -10,7 +10,7 @@ import (
 )
 
 // GkeEnforcePSP See https://github.com/tfsec/tfsec#included-checks for check info
-const GkeEnforcePSP scanner.RuleID = "GCP009"
+const GkeEnforcePSP scanner.RuleCode = "GCP009"
 const GkeEnforcePSPDescription scanner.RuleSummary = "Pod security policy enforcement not defined."
 const GkeEnforcePSPExplanation = `
 
diff --git a/internal/app/tfsec/checks/gcp010.go b/internal/app/tfsec/checks/gcp010.go
index 08442b1bf..e5498be26 100644
--- a/internal/app/tfsec/checks/gcp010.go
+++ b/internal/app/tfsec/checks/gcp010.go
@@ -11,7 +11,7 @@ import (
 )
 
 // GkeShieldedNodesDisabled See https://github.com/tfsec/tfsec#included-checks for check info
-const GkeShieldedNodesDisabled scanner.RuleID = "GCP010"
+const GkeShieldedNodesDisabled scanner.RuleCode = "GCP010"
 const GkeShieldedNodesDisabledDescription scanner.RuleSummary = "Shielded GKE nodes not enabled."
 const GkeShieldedNodesDisabledExplanation = `
 
diff --git a/internal/app/tfsec/checks/gcp011.go b/internal/app/tfsec/checks/gcp011.go
index 824872135..a00dd16a0 100644
--- a/internal/app/tfsec/checks/gcp011.go
+++ b/internal/app/tfsec/checks/gcp011.go
@@ -11,7 +11,7 @@ import (
 )
 
 // GoogleUserIAMGrant See https://github.com/tfsec/tfsec#included-checks for check info
-const GoogleUserIAMGrant scanner.RuleID = "GCP011"
+const GoogleUserIAMGrant scanner.RuleCode = "GCP011"
 const GoogleUserIAMGrantDescription scanner.RuleSummary = "IAM granted directly to user."
 const GoogleUserIAMGrantExplanation = `
 
diff --git a/internal/app/tfsec/checks/gen001.go b/internal/app/tfsec/checks/gen001.go
index da9588e87..80a012012 100644
--- a/internal/app/tfsec/checks/gen001.go
+++ b/internal/app/tfsec/checks/gen001.go
@@ -13,7 +13,7 @@ import (
 )
 
 // GenericSensitiveVariables See https://github.com/tfsec/tfsec#included-checks for check info
-const GenericSensitiveVariables scanner.RuleID = "GEN001"
+const GenericSensitiveVariables scanner.RuleCode = "GEN001"
 const GenericSensitiveVariablesDescription scanner.RuleSummary = "Potentially sensitive data stored in \"default\" value of variable."
 const GenericSensitiveVariablesExplanation = `
 Sensitive attributes such as passwords and API tokens should not be available in your templates, especially in a plaintext form. You can declare variables to hold the secrets, assuming you can provide values for those variables in a secure fashion. Alternatively, you can store these secrets in a secure secret store, such as AWS KMS.
diff --git a/internal/app/tfsec/checks/gen002.go b/internal/app/tfsec/checks/gen002.go
index 8dadf9ced..c83d5347d 100644
--- a/internal/app/tfsec/checks/gen002.go
+++ b/internal/app/tfsec/checks/gen002.go
@@ -13,7 +13,7 @@ import (
 )
 
 // GenericSensitiveLocals See https://github.com/tfsec/tfsec#included-checks for check info
-const GenericSensitiveLocals scanner.RuleID = "GEN002"
+const GenericSensitiveLocals scanner.RuleCode = "GEN002"
 const GenericSensitiveLocalsDescription scanner.RuleSummary = "Potentially sensitive data stored in local value."
 const GenericSensitiveLocalsExplanation = `
 Sensitive attributes such as passwords and API tokens should not be available in your templates, especially in a plaintext form. You can declare variables to hold the secrets, assuming you can provide values for those variables in a secure fashion. Alternatively, you can store these secrets in a secure secret store, such as AWS KMS.
diff --git a/internal/app/tfsec/checks/gen003.go b/internal/app/tfsec/checks/gen003.go
index 0beed2cdc..d0cf01dda 100644
--- a/internal/app/tfsec/checks/gen003.go
+++ b/internal/app/tfsec/checks/gen003.go
@@ -13,7 +13,7 @@ import (
 )
 
 // GenericSensitiveAttributes See https://github.com/tfsec/tfsec#included-checks for check info
-const GenericSensitiveAttributes scanner.RuleID = "GEN003"
+const GenericSensitiveAttributes scanner.RuleCode = "GEN003"
 const GenericSensitiveAttributesDescription scanner.RuleSummary = "Potentially sensitive data stored in block attribute."
 const GenericSensitiveAttributesExplanation = `
 Sensitive attributes such as passwords and API tokens should not be available in your templates, especially in a plaintext form. You can declare variables to hold the secrets, assuming you can provide values for those variables in a secure fashion. Alternatively, you can store these secrets in a secure secret store, such as AWS KMS.
diff --git a/internal/app/tfsec/scanner/check.go b/internal/app/tfsec/scanner/check.go
index cc8f5a0e4..937db9641 100644
--- a/internal/app/tfsec/scanner/check.go
+++ b/internal/app/tfsec/scanner/check.go
@@ -9,8 +9,8 @@ import (
 	"github.com/tfsec/tfsec/internal/app/tfsec/parser"
 )
 
-// RuleID is a unique identifier for a check
-type RuleID string
+// RuleCode is a unique identifier for a check
+type RuleCode string
 type RuleSummary string
 type RuleProvider string
 
@@ -24,7 +24,7 @@ const (
 // Check is a targeted security test which can be applied to terraform templates. It includes the types to run on e.g.
 // "resource", and the labels to run on e.g. "aws_s3_bucket".
 type Check struct {
-	Code           RuleID
+	Code           RuleCode
 	Documentation  CheckDocumentation
 	Provider       RuleProvider
 	RequiredTypes  []string
diff --git a/internal/app/tfsec/scanner/result.go b/internal/app/tfsec/scanner/result.go
index e4e3d5947..c31fab449 100644
--- a/internal/app/tfsec/scanner/result.go
+++ b/internal/app/tfsec/scanner/result.go
@@ -7,7 +7,7 @@ import (
 // Result is a positive result for a security check. It encapsulates a code unique to the specific check it was raised
 // by, a human-readable description and a range
 type Result struct {
-	RuleID          RuleID       `json:"rule_id"`
+	RuleID          RuleCode     `json:"rule_id"`
 	Link            string       `json:"link"`
 	Range           parser.Range `json:"location"`
 	Description     string       `json:"description"`
diff --git a/internal/app/tfsec/scanner/scanner.go b/internal/app/tfsec/scanner/scanner.go
index e51211e26..09f4fd346 100644
--- a/internal/app/tfsec/scanner/scanner.go
+++ b/internal/app/tfsec/scanner/scanner.go
@@ -20,7 +20,7 @@ func New() *Scanner {
 }
 
 // Find element in list
-func checkInList(code RuleID, list []string) bool {
+func checkInList(code RuleCode, list []string) bool {
 	codeCurrent := fmt.Sprintf("%s", code)
 	for _, codeIgnored := range list {
 		if codeIgnored == codeCurrent {
@@ -49,7 +49,7 @@ func (scanner *Scanner) Scan(blocks []*parser.Block, excludedChecksList []string
 	return results
 }
 
-func (scanner *Scanner) checkRangeIgnored(code RuleID, r parser.Range) bool {
+func (scanner *Scanner) checkRangeIgnored(code RuleCode, r parser.Range) bool {
 	raw, err := ioutil.ReadFile(r.Filename)
 	if err != nil {
 		return false


Test patch:
diff --git a/internal/app/tfsec/aws_iam_password_policy_checks_test.go b/internal/app/tfsec/aws_iam_password_policy_checks_test.go
deleted file mode 100644
index 48bda5be2..000000000
--- a/internal/app/tfsec/aws_iam_password_policy_checks_test.go
+++ /dev/null
@@ -1,288 +0,0 @@
-package tfsec
-
-import (
-	"testing"
-
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
-	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
-)
-
-func Test_AWSIamPasswordReusePrevention(t *testing.T) {
-
-	var tests = []struct {
-		name                  string
-		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
-	}{
-		{
-			name: "check aws_iam_account_password_policy has password_reuse_prevention set",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  minimum_password_length        = 8
-  require_lowercase_characters   = true
-  require_numbers                = true
-  require_uppercase_characters   = true
-  require_symbols                = true
-  allow_users_to_change_password = true
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordReusePrevention,
-		},
-		{
-			name: "check aws_iam_account_password_policy has password_reuse_prevention less than 5",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  minimum_password_length        = 8
-  require_lowercase_characters   = true
-  require_numbers                = true
-  require_uppercase_characters   = true
-  require_symbols                = true
-  allow_users_to_change_password = true
-  password_reuse_prevention      = 4
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordReusePrevention,
-		},
-		{
-			name: "check aws_iam_account_password_policy has password_reuse_prevention greater than 5",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  minimum_password_length        = 8
-  require_lowercase_characters   = true
-  require_numbers                = true
-  require_uppercase_characters   = true
-  require_symbols                = true
-  allow_users_to_change_password = true
-  password_reuse_prevention      = 5
-}`,
-			mustExcludeResultCode: checks.AWSIAMPasswordReusePrevention,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			results := scanSource(test.source)
-			assertCheckCode(t, test.mustIncludeResultCode, test.mustExcludeResultCode, results)
-		})
-	}
-}
-
-func Test_AWSIamPasswordMinimumLength(t *testing.T) {
-
-	var tests = []struct {
-		name                  string
-		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
-	}{
-		{
-			name: "check aws_iam_account_password_policy has minimum_password_length set",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  require_lowercase_characters   = true
-  require_numbers                = true
-  require_uppercase_characters   = true
-  require_symbols                = true
-  allow_users_to_change_password = true
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordMinimumLength,
-		},
-		{
-			name: "check aws_iam_account_password_policy has minimum_password_length less than 14",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  minimum_password_length        = 8
-  require_lowercase_characters   = true
-  require_numbers                = true
-  require_uppercase_characters   = true
-  require_symbols                = true
-  allow_users_to_change_password = true
-  password_reuse_prevention      = 4
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordMinimumLength,
-		},
-		{
-			name: "check aws_iam_account_password_policy has minimum_password_length greater than 14",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  minimum_password_length        = 14
-  require_lowercase_characters   = true
-  require_numbers                = true
-  require_uppercase_characters   = true
-  require_symbols                = true
-  allow_users_to_change_password = true
-}`,
-			mustExcludeResultCode: checks.AWSIAMPasswordMinimumLength,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			results := scanSource(test.source)
-			assertCheckCode(t, test.mustIncludeResultCode, test.mustExcludeResultCode, results)
-		})
-	}
-}
-
-func Test_AWSIamPasswordRequiresSymbol(t *testing.T) {
-
-	var tests = []struct {
-		name                  string
-		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
-	}{
-		{
-			name: "check aws_iam_account_password_policy has require_symbols set",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordRequiresSymbol,
-		},
-		{
-			name: "check aws_iam_account_password_policy require_symbols is set but not true",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  require_symbols                = false
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordRequiresSymbol,
-		},
-		{
-			name: "check aws_iam_account_password_policy require_symbols is set to true",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  require_symbols                = true
-}`,
-			mustExcludeResultCode: checks.AWSIAMPasswordRequiresSymbol,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			results := scanSource(test.source)
-			assertCheckCode(t, test.mustIncludeResultCode, test.mustExcludeResultCode, results)
-		})
-	}
-}
-
-func Test_AWSIamPasswordRequiresNumber(t *testing.T) {
-
-	var tests = []struct {
-		name                  string
-		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
-	}{
-		{
-			name: "check aws_iam_account_password_policy has require_numbers set",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordRequiresNumber,
-		},
-		{
-			name: "check aws_iam_account_password_policy require_numbers is set but not true",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  require_numbers                = false
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordRequiresNumber,
-		},
-		{
-			name: "check aws_iam_account_password_policy require_numbers is set to true",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  require_numbers                = true
-}`,
-			mustExcludeResultCode: checks.AWSIAMPasswordRequiresNumber,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			results := scanSource(test.source)
-			assertCheckCode(t, test.mustIncludeResultCode, test.mustExcludeResultCode, results)
-		})
-	}
-}
-
-func Test_AWSIamPasswordRequiresUppercaseCharacter(t *testing.T) {
-
-	var tests = []struct {
-		name                  string
-		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
-	}{
-		{
-			name: "check aws_iam_account_password_policy has require_uppercase_characters set",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordRequiresUppercaseCharacter,
-		},
-		{
-			name: "check aws_iam_account_password_policy require_uppercase_characters is set but not true",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  require_uppercase_characters                = false
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordRequiresUppercaseCharacter,
-		},
-		{
-			name: "check aws_iam_account_password_policy require_uppercase_characters is set to true",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  require_uppercase_characters                = true
-}`,
-			mustExcludeResultCode: checks.AWSIAMPasswordRequiresUppercaseCharacter,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			results := scanSource(test.source)
-			assertCheckCode(t, test.mustIncludeResultCode, test.mustExcludeResultCode, results)
-		})
-	}
-}
-
-func Test_AWSIamPasswordRequiresLowercaseCharacter(t *testing.T) {
-
-	var tests = []struct {
-		name                  string
-		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
-	}{
-		{
-			name: "check aws_iam_account_password_policy has require_lowercase_characters set",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordRequiresLowercaseCharacter,
-		},
-		{
-			name: "check aws_iam_account_password_policy has require_lowercase_characters is set but not true",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  require_lowercase_characters                = false
-}`,
-			mustIncludeResultCode: checks.AWSIAMPasswordRequiresLowercaseCharacter,
-		},
-		{
-			name: "check aws_iam_account_password_policy has require_lowercase_characters is set to true",
-			source: `
-resource "aws_iam_account_password_policy" "strict" {
-  require_lowercase_characters                = true
-}`,
-			mustExcludeResultCode: checks.AWSIAMPasswordRequiresLowercaseCharacter,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			results := scanSource(test.source)
-			assertCheckCode(t, test.mustIncludeResultCode, test.mustExcludeResultCode, results)
-		})
-	}
-}
diff --git a/internal/app/tfsec/aws_acl_test.go b/internal/app/tfsec/test/aws001_test.go
similarity index 93%
rename from internal/app/tfsec/aws_acl_test.go
rename to internal/app/tfsec/test/aws001_test.go
index 3c44576cf..0f3fe0f13 100644
--- a/internal/app/tfsec/aws_acl_test.go
+++ b/internal/app/tfsec/test/aws001_test.go
@@ -12,8 +12,8 @@ func Test_AWSACL(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_s3_bucket with acl=public-read",
diff --git a/internal/app/tfsec/aws_bucket_logging_test.go b/internal/app/tfsec/test/aws002_test.go
similarity index 91%
rename from internal/app/tfsec/aws_bucket_logging_test.go
rename to internal/app/tfsec/test/aws002_test.go
index 2c4bbe0eb..fa0791d8f 100644
--- a/internal/app/tfsec/aws_bucket_logging_test.go
+++ b/internal/app/tfsec/test/aws002_test.go
@@ -12,8 +12,8 @@ func Test_AWSBucketLogging(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check bucket with logging disabled",
diff --git a/internal/app/tfsec/aws_classic_test.go b/internal/app/tfsec/test/aws003_test.go
similarity index 93%
rename from internal/app/tfsec/aws_classic_test.go
rename to internal/app/tfsec/test/aws003_test.go
index 7aab8a127..2f76f9632 100644
--- a/internal/app/tfsec/aws_classic_test.go
+++ b/internal/app/tfsec/test/aws003_test.go
@@ -12,8 +12,8 @@ func Test_AWSClassicUsage(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name:                  "check aws_db_security_group",
diff --git a/internal/app/tfsec/aws_http_test.go b/internal/app/tfsec/test/aws004_test.go
similarity index 94%
rename from internal/app/tfsec/aws_http_test.go
rename to internal/app/tfsec/test/aws004_test.go
index 3ff6a307b..3ae7732a2 100644
--- a/internal/app/tfsec/aws_http_test.go
+++ b/internal/app/tfsec/test/aws004_test.go
@@ -12,8 +12,8 @@ func Test_AWSPlainHTTP(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_alb_listener using plain HTTP",
diff --git a/internal/app/tfsec/aws_not_internal_test.go b/internal/app/tfsec/test/aws005_test.go
similarity index 94%
rename from internal/app/tfsec/aws_not_internal_test.go
rename to internal/app/tfsec/test/aws005_test.go
index 73c4e6206..edca1708f 100644
--- a/internal/app/tfsec/aws_not_internal_test.go
+++ b/internal/app/tfsec/test/aws005_test.go
@@ -12,8 +12,8 @@ func Test_AWSNotInternal(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_alb when not internal",
diff --git a/internal/app/tfsec/aws_open_security_group_rule_test.go b/internal/app/tfsec/test/aws006_test.go
similarity index 96%
rename from internal/app/tfsec/aws_open_security_group_rule_test.go
rename to internal/app/tfsec/test/aws006_test.go
index c696fe236..ab160a42b 100644
--- a/internal/app/tfsec/aws_open_security_group_rule_test.go
+++ b/internal/app/tfsec/test/aws006_test.go
@@ -12,8 +12,8 @@ func Test_AWSOpenSecurityGroupRule(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_security_group_rule ingress on 0.0.0.0/0",
diff --git a/internal/app/tfsec/aws_open_security_group_test.go b/internal/app/tfsec/test/aws008_test.go
similarity index 97%
rename from internal/app/tfsec/aws_open_security_group_test.go
rename to internal/app/tfsec/test/aws008_test.go
index f9dada50b..a917fb495 100644
--- a/internal/app/tfsec/aws_open_security_group_test.go
+++ b/internal/app/tfsec/test/aws008_test.go
@@ -12,8 +12,8 @@ func Test_AWSOpenSecurityGroup(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_security_group ingress on 0.0.0.0/0",
diff --git a/internal/app/tfsec/aws_outdated_ssl_test.go b/internal/app/tfsec/test/aws010_test.go
similarity index 93%
rename from internal/app/tfsec/aws_outdated_ssl_test.go
rename to internal/app/tfsec/test/aws010_test.go
index ba82bd948..eee7eb6ef 100644
--- a/internal/app/tfsec/aws_outdated_ssl_test.go
+++ b/internal/app/tfsec/test/aws010_test.go
@@ -12,8 +12,8 @@ func Test_AWSOutdatedSSLPolicy(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_alb_listener with outdated policy",
diff --git a/internal/app/tfsec/aws_public_test.go b/internal/app/tfsec/test/aws011_test.go
similarity index 95%
rename from internal/app/tfsec/aws_public_test.go
rename to internal/app/tfsec/test/aws011_test.go
index d49ff5b04..c66e58147 100644
--- a/internal/app/tfsec/aws_public_test.go
+++ b/internal/app/tfsec/test/aws011_test.go
@@ -12,8 +12,8 @@ func Test_AWSPublic(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_db_instance when publicly exposed",
diff --git a/internal/app/tfsec/aws_public_ip_test.go b/internal/app/tfsec/test/aws012_test.go
similarity index 94%
rename from internal/app/tfsec/aws_public_ip_test.go
rename to internal/app/tfsec/test/aws012_test.go
index 4524231eb..ada841353 100644
--- a/internal/app/tfsec/aws_public_ip_test.go
+++ b/internal/app/tfsec/test/aws012_test.go
@@ -12,8 +12,8 @@ func Test_AWSPublicIP(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_launch_configuration with public ip associated",
diff --git a/internal/app/tfsec/aws_task_definition_includes_sensitive_data_test.go b/internal/app/tfsec/test/aws013_test.go
similarity index 96%
rename from internal/app/tfsec/aws_task_definition_includes_sensitive_data_test.go
rename to internal/app/tfsec/test/aws013_test.go
index a140edbac..13ede17ae 100644
--- a/internal/app/tfsec/aws_task_definition_includes_sensitive_data_test.go
+++ b/internal/app/tfsec/test/aws013_test.go
@@ -12,8 +12,8 @@ func Test_AWSTaskDefinitionIncludesSensitiveData(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_ecs_task_definition when sensitive env vars are included",
diff --git a/internal/app/tfsec/aws_unencrypted_block_device_test.go b/internal/app/tfsec/test/aws014_test.go
similarity index 97%
rename from internal/app/tfsec/aws_unencrypted_block_device_test.go
rename to internal/app/tfsec/test/aws014_test.go
index c75769bdd..781ce6e94 100644
--- a/internal/app/tfsec/aws_unencrypted_block_device_test.go
+++ b/internal/app/tfsec/test/aws014_test.go
@@ -12,8 +12,8 @@ func Test_AWSUnencryptedBlockDevice(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no root_block_device configured in launch configuration",
diff --git a/internal/app/tfsec/aws_unencrypted_sqs_queue_test.go b/internal/app/tfsec/test/aws015_test.go
similarity index 93%
rename from internal/app/tfsec/aws_unencrypted_sqs_queue_test.go
rename to internal/app/tfsec/test/aws015_test.go
index 45d89e9d5..c81939b2a 100644
--- a/internal/app/tfsec/aws_unencrypted_sqs_queue_test.go
+++ b/internal/app/tfsec/test/aws015_test.go
@@ -12,8 +12,8 @@ func Test_AWSUnencryptedSQSQueue(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no encryption key id specified for aws_sqs_queue",
diff --git a/internal/app/tfsec/aws_unencrypted_sns_topic_test.go b/internal/app/tfsec/test/aws016_test.go
similarity index 93%
rename from internal/app/tfsec/aws_unencrypted_sns_topic_test.go
rename to internal/app/tfsec/test/aws016_test.go
index e2078a7ab..fa16be3cd 100644
--- a/internal/app/tfsec/aws_unencrypted_sns_topic_test.go
+++ b/internal/app/tfsec/test/aws016_test.go
@@ -12,8 +12,8 @@ func Test_AWSUnencryptedSNSTopic(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no encryption key id specified for aws_sns_topic",
diff --git a/internal/app/tfsec/aws_unencrypted_s3_bucket_test.go b/internal/app/tfsec/test/aws017_test.go
similarity index 93%
rename from internal/app/tfsec/aws_unencrypted_s3_bucket_test.go
rename to internal/app/tfsec/test/aws017_test.go
index e2668f760..726f828f3 100644
--- a/internal/app/tfsec/aws_unencrypted_s3_bucket_test.go
+++ b/internal/app/tfsec/test/aws017_test.go
@@ -12,8 +12,8 @@ func Test_AWSUnencryptedS3Bucket(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no server_side_encryption_configuration aws_s3_bucket",
diff --git a/internal/app/tfsec/aws_missing_description_for_security_group_test.go b/internal/app/tfsec/test/aws018_test.go
similarity index 94%
rename from internal/app/tfsec/aws_missing_description_for_security_group_test.go
rename to internal/app/tfsec/test/aws018_test.go
index e031bc680..e2400416b 100644
--- a/internal/app/tfsec/aws_missing_description_for_security_group_test.go
+++ b/internal/app/tfsec/test/aws018_test.go
@@ -12,8 +12,8 @@ func Test_AWSMissingDescriptionForSecurityGroup(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_security_group without description",
diff --git a/internal/app/tfsec/aws_no_kms_key_autorotate_test.go b/internal/app/tfsec/test/aws019_test.go
similarity index 92%
rename from internal/app/tfsec/aws_no_kms_key_autorotate_test.go
rename to internal/app/tfsec/test/aws019_test.go
index 344d44b52..0c7b5a0d9 100644
--- a/internal/app/tfsec/aws_no_kms_key_autorotate_test.go
+++ b/internal/app/tfsec/test/aws019_test.go
@@ -11,8 +11,8 @@ func Test_AWSNoKmsKeyAutoRotate(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name:                  "check KMS Key with auto-rotation not set",
diff --git a/internal/app/tfsec/aws_unencrypted_cloudfront_communications_test.go b/internal/app/tfsec/test/aws020_test.go
similarity index 96%
rename from internal/app/tfsec/aws_unencrypted_cloudfront_communications_test.go
rename to internal/app/tfsec/test/aws020_test.go
index fddcf6315..b8f3c18d6 100644
--- a/internal/app/tfsec/aws_unencrypted_cloudfront_communications_test.go
+++ b/internal/app/tfsec/test/aws020_test.go
@@ -11,8 +11,8 @@ func Test_AWSUnencryptedCloudFrontCommunications(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no default_cache_behavior in aws_cloudfront_distribution",
diff --git a/internal/app/tfsec/aws_cloudfront_outdated_protocol_test.go b/internal/app/tfsec/test/aws021_test.go
similarity index 94%
rename from internal/app/tfsec/aws_cloudfront_outdated_protocol_test.go
rename to internal/app/tfsec/test/aws021_test.go
index 9a4cd9795..f0c5f3254 100644
--- a/internal/app/tfsec/aws_cloudfront_outdated_protocol_test.go
+++ b/internal/app/tfsec/test/aws021_test.go
@@ -11,8 +11,8 @@ func Test_AWSCloudFrontOutdatedProtocol(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no viewer_certificate block in aws_cloudfront_distribution",
diff --git a/internal/app/tfsec/aws_unencrypted_msk_broker_transit_test.go b/internal/app/tfsec/test/aws022_test.go
similarity index 96%
rename from internal/app/tfsec/aws_unencrypted_msk_broker_transit_test.go
rename to internal/app/tfsec/test/aws022_test.go
index bb60c24f4..322b44329 100644
--- a/internal/app/tfsec/aws_unencrypted_msk_broker_transit_test.go
+++ b/internal/app/tfsec/test/aws022_test.go
@@ -11,8 +11,8 @@ func Test_AWSUnencryptedMSKBroker(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name:                  "check MSK broker with encryption_info not set",
diff --git a/internal/app/tfsec/aws_no_ecr_repository_scan_test.go b/internal/app/tfsec/test/aws023_test.go
similarity index 93%
rename from internal/app/tfsec/aws_no_ecr_repository_scan_test.go
rename to internal/app/tfsec/test/aws023_test.go
index 3bdee66dc..e92fcdccf 100644
--- a/internal/app/tfsec/aws_no_ecr_repository_scan_test.go
+++ b/internal/app/tfsec/test/aws023_test.go
@@ -11,8 +11,8 @@ func Test_AWSEcrImageScanNotEnabled(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name:                  "check ECR Image Scan disabled",
diff --git a/internal/app/tfsec/aws_unencrypted_kinesis_streams_test.go b/internal/app/tfsec/test/aws024_test.go
similarity index 93%
rename from internal/app/tfsec/aws_unencrypted_kinesis_streams_test.go
rename to internal/app/tfsec/test/aws024_test.go
index c323c232a..bb37921c8 100644
--- a/internal/app/tfsec/aws_unencrypted_kinesis_streams_test.go
+++ b/internal/app/tfsec/test/aws024_test.go
@@ -12,8 +12,8 @@ func Test_AWSUnencryptedKinesisStream(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no encryption key id specified for aws_sqs_queue",
diff --git a/internal/app/tfsec/aws_api_gateway_domain_name_missing_security_policy_test.go b/internal/app/tfsec/test/aws025_test.go
similarity index 94%
rename from internal/app/tfsec/aws_api_gateway_domain_name_missing_security_policy_test.go
rename to internal/app/tfsec/test/aws025_test.go
index ef09ba681..649ea2cb7 100644
--- a/internal/app/tfsec/aws_api_gateway_domain_name_missing_security_policy_test.go
+++ b/internal/app/tfsec/test/aws025_test.go
@@ -12,8 +12,8 @@ func Test_AWSMissingSecurityPolicy(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_api_gateway_domain_name with outdated policy",
diff --git a/internal/app/tfsec/aws_unencrypted_elasticearch_domain_test.go b/internal/app/tfsec/test/aws031_test.go
similarity index 94%
rename from internal/app/tfsec/aws_unencrypted_elasticearch_domain_test.go
rename to internal/app/tfsec/test/aws031_test.go
index 02f1773ae..2813c1878 100644
--- a/internal/app/tfsec/aws_unencrypted_elasticearch_domain_test.go
+++ b/internal/app/tfsec/test/aws031_test.go
@@ -12,8 +12,8 @@ func TestAWSUnencryptedElasticsearchDomain(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no encrypt_at_rest block aws_elasticsearch_domain",
diff --git a/internal/app/tfsec/aws_plaintext_node_to_node_elasticsearch_traffic_test.go b/internal/app/tfsec/test/aws032_test.go
similarity index 94%
rename from internal/app/tfsec/aws_plaintext_node_to_node_elasticsearch_traffic_test.go
rename to internal/app/tfsec/test/aws032_test.go
index a9eabce69..29724cbb3 100644
--- a/internal/app/tfsec/aws_plaintext_node_to_node_elasticsearch_traffic_test.go
+++ b/internal/app/tfsec/test/aws032_test.go
@@ -12,8 +12,8 @@ func Test_AWSPlaintextNodeToNodeElasticsearchTraffic(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no node_to_node_encryption block aws_elasticsearch_domain",
diff --git a/internal/app/tfsec/aws_unenforced_https_elasticsearch_domain_endpoint_test.go b/internal/app/tfsec/test/aws033_test.go
similarity index 94%
rename from internal/app/tfsec/aws_unenforced_https_elasticsearch_domain_endpoint_test.go
rename to internal/app/tfsec/test/aws033_test.go
index 51664de6d..e22c9cba9 100644
--- a/internal/app/tfsec/aws_unenforced_https_elasticsearch_domain_endpoint_test.go
+++ b/internal/app/tfsec/test/aws033_test.go
@@ -12,8 +12,8 @@ func Test_AWSUnenforcedHTTPSElasticsearchDomainEndpoint(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no  domain_endpoint_options aws_elasticsearch_domain",
diff --git a/internal/app/tfsec/aws_outdated_tls_policy_elasticsearch_domain_endpoint_test.go b/internal/app/tfsec/test/aws034_test.go
similarity index 95%
rename from internal/app/tfsec/aws_outdated_tls_policy_elasticsearch_domain_endpoint_test.go
rename to internal/app/tfsec/test/aws034_test.go
index 2581eba86..9786ab594 100644
--- a/internal/app/tfsec/aws_outdated_tls_policy_elasticsearch_domain_endpoint_test.go
+++ b/internal/app/tfsec/test/aws034_test.go
@@ -12,8 +12,8 @@ func Test_AWSOutdatedTLSPolicyElasticsearchDomainEndpoint(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check no domain_endpoint_options aws_elasticsearch_domain",
diff --git a/internal/app/tfsec/aws_unencrypted_at_rest_elasticache_replication_group_test.go b/internal/app/tfsec/test/aws035_test.go
similarity index 93%
rename from internal/app/tfsec/aws_unencrypted_at_rest_elasticache_replication_group_test.go
rename to internal/app/tfsec/test/aws035_test.go
index 0d249fb07..b727151bb 100644
--- a/internal/app/tfsec/aws_unencrypted_at_rest_elasticache_replication_group_test.go
+++ b/internal/app/tfsec/test/aws035_test.go
@@ -11,8 +11,8 @@ func Test_AWSUnencryptedAtRestElasticacheReplicationGroup(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_elasticache_replication_group missing at_rest_encryption_enabled",
diff --git a/internal/app/tfsec/aws_unencrypted_in_transit_elasticache_replication_group_test.go b/internal/app/tfsec/test/aws036_test.go
similarity index 93%
rename from internal/app/tfsec/aws_unencrypted_in_transit_elasticache_replication_group_test.go
rename to internal/app/tfsec/test/aws036_test.go
index 225c56743..8cef7851a 100644
--- a/internal/app/tfsec/aws_unencrypted_in_transit_elasticache_replication_group_test.go
+++ b/internal/app/tfsec/test/aws036_test.go
@@ -11,8 +11,8 @@ func Test_AWSUnencryptedInTransitElasticacheReplicationGroup(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_elasticache_replication_group missing transit_encryption_enabled",
diff --git a/internal/app/tfsec/aws_provider_test.go b/internal/app/tfsec/test/aws044_test.go
similarity index 94%
rename from internal/app/tfsec/aws_provider_test.go
rename to internal/app/tfsec/test/aws044_test.go
index caa3c0ef2..c8d04e725 100644
--- a/internal/app/tfsec/aws_provider_test.go
+++ b/internal/app/tfsec/test/aws044_test.go
@@ -12,8 +12,8 @@ func Test_AWSProviderHasAccessCredentials(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws provider has access key specified",
diff --git a/internal/app/tfsec/aws_cloudfront_does_not_have_waf_test.go b/internal/app/tfsec/test/aws045_test.go
similarity index 96%
rename from internal/app/tfsec/aws_cloudfront_does_not_have_waf_test.go
rename to internal/app/tfsec/test/aws045_test.go
index bca7efc83..5d55b1382 100644
--- a/internal/app/tfsec/aws_cloudfront_does_not_have_waf_test.go
+++ b/internal/app/tfsec/test/aws045_test.go
@@ -11,8 +11,8 @@ func Test_AWSCloudFrontWafWebAclId(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check there is no waf web_acl_id for aws_cloudfront_distribution",
diff --git a/internal/app/tfsec/aws_iam_policy_document_test.go b/internal/app/tfsec/test/aws046_test.go
similarity index 93%
rename from internal/app/tfsec/aws_iam_policy_document_test.go
rename to internal/app/tfsec/test/aws046_test.go
index ee33b4dc0..dd47f56ca 100644
--- a/internal/app/tfsec/aws_iam_policy_document_test.go
+++ b/internal/app/tfsec/test/aws046_test.go
@@ -12,8 +12,8 @@ func Test_AWSIamPolicyDocument(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check aws_iam_policy_document does not have any wildcard actions.",
diff --git a/internal/app/tfsec/azurerm_open_network_security_rules_test.go b/internal/app/tfsec/test/azu001_test.go
similarity index 97%
rename from internal/app/tfsec/azurerm_open_network_security_rules_test.go
rename to internal/app/tfsec/test/azu001_test.go
index a77735250..b5ccd95e2 100644
--- a/internal/app/tfsec/azurerm_open_network_security_rules_test.go
+++ b/internal/app/tfsec/test/azu001_test.go
@@ -12,8 +12,8 @@ func Test_AzureOpenNetworkSecurityGroupRule(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check azurerm_network_security_rule inbound on 0.0.0.0/0",
diff --git a/internal/app/tfsec/azurerm_unencrypted_managed_disk_test.go b/internal/app/tfsec/test/azu003_test.go
similarity index 93%
rename from internal/app/tfsec/azurerm_unencrypted_managed_disk_test.go
rename to internal/app/tfsec/test/azu003_test.go
index a0e464abe..00f9b04d5 100644
--- a/internal/app/tfsec/azurerm_unencrypted_managed_disk_test.go
+++ b/internal/app/tfsec/test/azu003_test.go
@@ -12,8 +12,8 @@ func Test_AzureUnencryptedManagedDisk(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check azurerm_managed_disk with no encryption_settings",
diff --git a/internal/app/tfsec/azurerm_unencrypted_data_lake_store_test.go b/internal/app/tfsec/test/azu004_test.go
similarity index 93%
rename from internal/app/tfsec/azurerm_unencrypted_data_lake_store_test.go
rename to internal/app/tfsec/test/azu004_test.go
index 40255bc4a..59f53cee0 100644
--- a/internal/app/tfsec/azurerm_unencrypted_data_lake_store_test.go
+++ b/internal/app/tfsec/test/azu004_test.go
@@ -12,8 +12,8 @@ func Test_AzureUnencryptedDataLakeStore(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check azurerm_data_lake_store with encryption disabled",
diff --git a/internal/app/tfsec/azurerm_virtual_machine_with_password_authentication_test.go b/internal/app/tfsec/test/azu005_test.go
similarity index 92%
rename from internal/app/tfsec/azurerm_virtual_machine_with_password_authentication_test.go
rename to internal/app/tfsec/test/azu005_test.go
index 35da7f147..71fe4097e 100644
--- a/internal/app/tfsec/azurerm_virtual_machine_with_password_authentication_test.go
+++ b/internal/app/tfsec/test/azu005_test.go
@@ -12,8 +12,8 @@ func Test_AzureVMWithPasswordAuth(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check azurerm_virtual_machine with password auth",
diff --git a/internal/app/tfsec/google_unencrypted_disk_test.go b/internal/app/tfsec/test/gcp001_test.go
similarity index 94%
rename from internal/app/tfsec/google_unencrypted_disk_test.go
rename to internal/app/tfsec/test/gcp001_test.go
index 9e4f7c316..20e87d398 100644
--- a/internal/app/tfsec/google_unencrypted_disk_test.go
+++ b/internal/app/tfsec/test/gcp001_test.go
@@ -12,8 +12,8 @@ func Test_GoogleUnencryptedDisk(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_compute_disk with no disk_encryption_key block",
diff --git a/internal/app/tfsec/google_unencrypted_storage_bucket_test.go b/internal/app/tfsec/test/gcp002_test.go
similarity index 93%
rename from internal/app/tfsec/google_unencrypted_storage_bucket_test.go
rename to internal/app/tfsec/test/gcp002_test.go
index b3efdd37b..82f3696b0 100644
--- a/internal/app/tfsec/google_unencrypted_storage_bucket_test.go
+++ b/internal/app/tfsec/test/gcp002_test.go
@@ -12,8 +12,8 @@ func Test_GoogleUnencryptedStorageBucket(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_storage_bucket with no encryption block",
diff --git a/internal/app/tfsec/google_open_firewall_rule_test.go b/internal/app/tfsec/test/gcp003_test.go
similarity index 91%
rename from internal/app/tfsec/google_open_firewall_rule_test.go
rename to internal/app/tfsec/test/gcp003_test.go
index 00f4925c2..c50f6144d 100644
--- a/internal/app/tfsec/google_open_firewall_rule_test.go
+++ b/internal/app/tfsec/test/gcp003_test.go
@@ -12,8 +12,8 @@ func Test_GoogleOpenInboundFirewallRule(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_compute_firewall ingress on 0.0.0.0/0",
@@ -47,8 +47,8 @@ func Test_GoogleOpenOutboundFirewallRule(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_compute_firewall egress on 0.0.0.0/0",
diff --git a/internal/app/tfsec/gke_abac_enabled_test.go b/internal/app/tfsec/test/gcp005_test.go
similarity index 89%
rename from internal/app/tfsec/gke_abac_enabled_test.go
rename to internal/app/tfsec/test/gcp005_test.go
index 24fda269f..5c0f3d7a7 100644
--- a/internal/app/tfsec/gke_abac_enabled_test.go
+++ b/internal/app/tfsec/test/gcp005_test.go
@@ -12,8 +12,8 @@ func Test_GkeAbacEnabled(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_container_cluster with enable_legacy_abac set to true",
diff --git a/internal/app/tfsec/gke_node_metadata_exposed_test.go b/internal/app/tfsec/test/gcp006_test.go
similarity index 92%
rename from internal/app/tfsec/gke_node_metadata_exposed_test.go
rename to internal/app/tfsec/test/gcp006_test.go
index 6815db703..457422ff1 100644
--- a/internal/app/tfsec/gke_node_metadata_exposed_test.go
+++ b/internal/app/tfsec/test/gcp006_test.go
@@ -12,8 +12,8 @@ func Test_GkeNodeMetadataExposed(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_container_cluster with workload_metadata_config.node_metadata set to EXPOSE",
diff --git a/internal/app/tfsec/gke_legacy_metadata_endpoints_test.go b/internal/app/tfsec/test/gcp007_test.go
similarity index 92%
rename from internal/app/tfsec/gke_legacy_metadata_endpoints_test.go
rename to internal/app/tfsec/test/gcp007_test.go
index 116279a0b..09d554dbb 100644
--- a/internal/app/tfsec/gke_legacy_metadata_endpoints_test.go
+++ b/internal/app/tfsec/test/gcp007_test.go
@@ -12,8 +12,8 @@ func Test_GkeLegacyMetadataEndpoints(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_container_cluster with metadata.disable-legacy-endpoints set to false",
diff --git a/internal/app/tfsec/gke_legacy_auth_enabled_test.go b/internal/app/tfsec/test/gcp008_test.go
similarity index 94%
rename from internal/app/tfsec/gke_legacy_auth_enabled_test.go
rename to internal/app/tfsec/test/gcp008_test.go
index f5a31b097..2c6ecb666 100644
--- a/internal/app/tfsec/gke_legacy_auth_enabled_test.go
+++ b/internal/app/tfsec/test/gcp008_test.go
@@ -12,8 +12,8 @@ func Test_GkeLegacyAuthEnabled(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_container_cluster with master_auth static user/pass not disable",
diff --git a/internal/app/tfsec/gke_enforce_psp_test.go b/internal/app/tfsec/test/gcp009_test.go
similarity index 93%
rename from internal/app/tfsec/gke_enforce_psp_test.go
rename to internal/app/tfsec/test/gcp009_test.go
index 2a4c921b2..fc2a85195 100644
--- a/internal/app/tfsec/gke_enforce_psp_test.go
+++ b/internal/app/tfsec/test/gcp009_test.go
@@ -12,8 +12,8 @@ func Test_GkeEnforcePSPTest(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_container_cluster with pod_security_policy_config.enabled set to false",
diff --git a/internal/app/tfsec/gke_shielded_nodes_disabled_test.go b/internal/app/tfsec/test/gcp010_test.go
similarity index 93%
rename from internal/app/tfsec/gke_shielded_nodes_disabled_test.go
rename to internal/app/tfsec/test/gcp010_test.go
index 88fab2cb6..b5164f9b4 100644
--- a/internal/app/tfsec/gke_shielded_nodes_disabled_test.go
+++ b/internal/app/tfsec/test/gcp010_test.go
@@ -12,8 +12,8 @@ func Test_GkeShieldedNodesDisabled(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_container_cluster with enable_shielded_nodes set to false",
diff --git a/internal/app/tfsec/google_user_iam_grant_test.go b/internal/app/tfsec/test/gcp011_test.go
similarity index 96%
rename from internal/app/tfsec/google_user_iam_grant_test.go
rename to internal/app/tfsec/test/gcp011_test.go
index 76890099e..96dd9a072 100644
--- a/internal/app/tfsec/google_user_iam_grant_test.go
+++ b/internal/app/tfsec/test/gcp011_test.go
@@ -12,8 +12,8 @@ func Test_GoogleUserIAMGrant(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check google_project_iam_binding with grant to user identity",
diff --git a/internal/app/tfsec/generic_sensitive_variables_test.go b/internal/app/tfsec/test/gen001_test.go
similarity index 91%
rename from internal/app/tfsec/generic_sensitive_variables_test.go
rename to internal/app/tfsec/test/gen001_test.go
index 86d06f1c0..3287d1d24 100644
--- a/internal/app/tfsec/generic_sensitive_variables_test.go
+++ b/internal/app/tfsec/test/gen001_test.go
@@ -12,8 +12,8 @@ func Test_AWSSensitiveVariables(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check sensitive variable with value",
diff --git a/internal/app/tfsec/generic_sensitive_locals_test.go b/internal/app/tfsec/test/gen002_test.go
similarity index 90%
rename from internal/app/tfsec/generic_sensitive_locals_test.go
rename to internal/app/tfsec/test/gen002_test.go
index 1a27b2559..ffc811bc9 100644
--- a/internal/app/tfsec/generic_sensitive_locals_test.go
+++ b/internal/app/tfsec/test/gen002_test.go
@@ -12,8 +12,8 @@ func Test_AWSSensitiveLocals(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check sensitive local with value",
diff --git a/internal/app/tfsec/generic_sensitive_attributes_test.go b/internal/app/tfsec/test/gen003_test.go
similarity index 92%
rename from internal/app/tfsec/generic_sensitive_attributes_test.go
rename to internal/app/tfsec/test/gen003_test.go
index fa0101027..49af0cead 100644
--- a/internal/app/tfsec/generic_sensitive_attributes_test.go
+++ b/internal/app/tfsec/test/gen003_test.go
@@ -12,8 +12,8 @@ func Test_AWSSensitiveAttributes(t *testing.T) {
 	var tests = []struct {
 		name                  string
 		source                string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check sensitive attribute",
diff --git a/internal/app/tfsec/ignore_test.go b/internal/app/tfsec/test/ignore_test.go
similarity index 95%
rename from internal/app/tfsec/ignore_test.go
rename to internal/app/tfsec/test/ignore_test.go
index 99b86d471..d505ad140 100644
--- a/internal/app/tfsec/ignore_test.go
+++ b/internal/app/tfsec/test/ignore_test.go
@@ -49,6 +49,6 @@ func Test_IgnoreSpecific(t *testing.T) {
 resource "bad" "my-bad" {} //tfsec:ignore:ABC123
 `)
 	require.Len(t, results, 1)
-	assert.Equal(t, results[0].RuleID, scanner.RuleID("DEF456"))
+	assert.Equal(t, results[0].RuleID, scanner.RuleCode("DEF456"))
 
 }
diff --git a/internal/app/tfsec/module_scan_test.go b/internal/app/tfsec/test/module_scan_test.go
similarity index 91%
rename from internal/app/tfsec/module_scan_test.go
rename to internal/app/tfsec/test/module_scan_test.go
index 0cbbc10ae..d1da183ef 100644
--- a/internal/app/tfsec/module_scan_test.go
+++ b/internal/app/tfsec/test/module_scan_test.go
@@ -13,8 +13,8 @@ func Test_ProblemInModule(t *testing.T) {
 		name                  string
 		source                string
 		moduleSource          string
-		mustIncludeResultCode scanner.RuleID
-		mustExcludeResultCode scanner.RuleID
+		mustIncludeResultCode scanner.RuleCode
+		mustExcludeResultCode scanner.RuleCode
 	}{
 		{
 			name: "check problem in module",
diff --git a/internal/app/tfsec/setup_test.go b/internal/app/tfsec/test/setup_test.go
similarity index 91%
rename from internal/app/tfsec/setup_test.go
rename to internal/app/tfsec/test/setup_test.go
index e54c5d416..f1e305f7f 100644
--- a/internal/app/tfsec/setup_test.go
+++ b/internal/app/tfsec/test/setup_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
-const exampleCheckCode scanner.RuleID = "EXA001"
+const exampleCheckCode scanner.RuleCode = "EXA001"
 
 var excludedChecksList []string
 
@@ -58,7 +58,7 @@ func createTestFile(filename, contents string) string {
 	return path
 }
 
-func assertCheckCode(t *testing.T, includeCode scanner.RuleID, excludeCode scanner.RuleID, results []scanner.Result) {
+func assertCheckCode(t *testing.T, includeCode scanner.RuleCode, excludeCode scanner.RuleCode, results []scanner.Result) {
 
 	var foundInclude bool
 	var foundExclude bool
@@ -73,7 +73,7 @@ func assertCheckCode(t *testing.T, includeCode scanner.RuleID, excludeCode scann
 	}
 
 	assert.False(t, foundExclude, fmt.Sprintf("result with code '%s' was found but should not have been", excludeCode))
-	if includeCode != scanner.RuleID("") {
+	if includeCode != scanner.RuleCode("") {
 		assert.True(t, foundInclude, fmt.Sprintf("result with code '%s' was not found but should have been", includeCode))
 	}
 }