From ecb1092f3199d037ef0df99b9982120a6918a592 Mon Sep 17 00:00:00 2001
From: Simar <simar@linux.com>
Date: Tue, 13 Feb 2024 20:01:12 -0700
Subject: [PATCH 1/4] refactor(deps): Add id and docGen cmds

---
 Makefile                       |   2 +-
 cmd/avd_generator/main.go      | 193 +++++++++++++++++++++++++++++++++
 cmd/avd_generator/main_test.go |  85 +++++++++++++++
 cmd/id/main.go                 |  52 +++++++++
 cmd/opa/main.go                |   3 +-
 5 files changed, 333 insertions(+), 2 deletions(-)
 create mode 100644 cmd/avd_generator/main.go
 create mode 100644 cmd/avd_generator/main_test.go
 create mode 100644 cmd/id/main.go

diff --git a/Makefile b/Makefile
index 20a5c6f7..f19936a6 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ fmt-rego:
 
 .PHONY: test-rego
 test-rego:
-	go run ./cmd/opa test lib/ checks/
+	go run ./cmd/opa test --explain=fails lib/ checks/
 
 .PHONY: bundle
 bundle: create-bundle verify-bundle
diff --git a/cmd/avd_generator/main.go b/cmd/avd_generator/main.go
new file mode 100644
index 00000000..90eaf88b
--- /dev/null
+++ b/cmd/avd_generator/main.go
@@ -0,0 +1,193 @@
+package main
+
+import (
+	"fmt"
+	goast "go/ast"
+	"go/parser"
+	"go/token"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"text/template"
+
+	policies "github.com/aquasecurity/trivy-policies"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	_ "github.com/aquasecurity/trivy/pkg/iac/rego"
+	registered "github.com/aquasecurity/trivy/pkg/iac/rules"
+	types "github.com/aquasecurity/trivy/pkg/iac/types/rules"
+)
+
+func main() {
+	var generateCount int
+
+	for _, metadata := range registered.GetRegistered(framework.ALL) {
+		writeDocsFile(metadata, "avd_docs")
+		generateCount++
+	}
+
+	fmt.Printf("\nGenerated %d files in avd_docs\n", generateCount)
+}
+
+// nolint: cyclop
+func writeDocsFile(meta types.RegisteredRule, path string) {
+
+	tmpl, err := template.New("defsec").Parse(docsMarkdownTemplate)
+	if err != nil {
+		fail("error occurred creating the template %v\n", err)
+	}
+
+	docpath := filepath.Join(path,
+		strings.ToLower(meta.GetRule().Provider.ConstName()),
+		strings.ToLower(strings.ReplaceAll(meta.GetRule().Service, "-", "")),
+		meta.GetRule().AVDID,
+	)
+
+	if err := os.MkdirAll(docpath, os.ModePerm); err != nil {
+		panic(err)
+	}
+
+	file, err := os.Create(filepath.Join(docpath, "docs.md"))
+	if err != nil {
+		fail("error occurred creating the docs file for %s", docpath)
+	}
+
+	if err := tmpl.Execute(file, meta.GetRule()); err != nil {
+		fail("error occurred generating the document %v", err)
+	}
+	fmt.Printf("Generating docs file for policy %s\n", meta.GetRule().AVDID)
+
+	if meta.GetRule().Terraform != nil {
+		if len(meta.GetRule().Terraform.GoodExamples) > 0 || len(meta.GetRule().Terraform.Links) > 0 {
+			if meta.GetRule().RegoPackage != "" { // get examples from file as rego rules don't have embedded
+				value, err := GetExampleValueFromFile(meta.GetRule().Terraform.GoodExamples[0], "GoodExamples")
+				if err != nil {
+					fail("error retrieving examples from metadata: %v\n", err)
+				}
+				meta.GetRule().Terraform.GoodExamples = []string{value}
+			}
+
+			tmpl, err := template.New("terraform").Parse(terraformMarkdownTemplate)
+			if err != nil {
+				fail("error occurred creating the template %v\n", err)
+			}
+			file, err := os.Create(filepath.Join(docpath, "Terraform.md"))
+			if err != nil {
+				fail("error occurred creating the Terraform file for %s", docpath)
+			}
+			defer func() { _ = file.Close() }()
+
+			if err := tmpl.Execute(file, meta.GetRule()); err != nil {
+				fail("error occurred generating the document %v", err)
+			}
+			fmt.Printf("Generating Terraform file for policy %s\n", meta.GetRule().AVDID)
+		}
+	}
+
+	if meta.GetRule().CloudFormation != nil {
+		if len(meta.GetRule().CloudFormation.GoodExamples) > 0 || len(meta.GetRule().CloudFormation.Links) > 0 {
+			if meta.GetRule().RegoPackage != "" { // get examples from file as rego rules don't have embedded
+				value, err := GetExampleValueFromFile(meta.GetRule().CloudFormation.GoodExamples[0], "GoodExamples")
+				if err != nil {
+					fail("error retrieving examples from metadata: %v\n", err)
+				}
+				meta.GetRule().CloudFormation.GoodExamples = []string{value}
+			}
+
+			tmpl, err := template.New("cloudformation").Parse(cloudformationMarkdownTemplate)
+			if err != nil {
+				fail("error occurred creating the template %v\n", err)
+			}
+			file, err := os.Create(filepath.Join(docpath, "CloudFormation.md"))
+			if err != nil {
+				fail("error occurred creating the CloudFormation file for %s", docpath)
+			}
+			defer func() { _ = file.Close() }()
+
+			if err := tmpl.Execute(file, meta.GetRule()); err != nil {
+				fail("error occurred generating the document %v", err)
+			}
+			fmt.Printf("Generating CloudFormation file for policy %s\n", meta.GetRule().AVDID)
+		}
+	}
+}
+
+func fail(msg string, args ...interface{}) {
+	fmt.Printf(msg, args...)
+	os.Exit(1)
+}
+
+func readFileFromPolicyFS(path string) (io.Reader, error) {
+	path = strings.TrimPrefix(path, "rules/")
+	return policies.EmbeddedPolicyFileSystem.Open(path)
+
+}
+
+func GetExampleValueFromFile(filename string, exampleType string) (string, error) {
+	r, err := readFileFromPolicyFS(filename)
+	if err != nil {
+		return "", err
+	}
+	f, err := parser.ParseFile(token.NewFileSet(), filename, r, parser.AllErrors)
+	if err != nil {
+		return "", err
+	}
+
+	for _, d := range f.Decls {
+		switch decl := d.(type) {
+		case *goast.GenDecl:
+			for _, spec := range decl.Specs {
+				switch spec := spec.(type) {
+				case *goast.ValueSpec:
+					for _, id := range spec.Names {
+						switch v := id.Obj.Decl.(*goast.ValueSpec).Values[0].(type) {
+						case *goast.CompositeLit:
+							value := v.Elts[0].(*goast.BasicLit).Value
+							if strings.Contains(id.Name, exampleType) {
+								return strings.ReplaceAll(value, "`", ""), nil
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	return "", fmt.Errorf("exampleType %s not found in file: %s", exampleType, filename)
+}
+
+var docsMarkdownTemplate = `
+{{ .Explanation }}
+
+### Impact
+{{ if .Impact }}{{ .Impact }}{{ else }}<!-- Add Impact here -->{{ end }}
+
+<!-- DO NOT CHANGE -->
+{{ ` + "`{{ " + `remediationActions ` + "`}}" + `}}
+
+{{ if .Links }}### Links{{ range .Links }}
+- {{ . }}
+{{ end}}
+{{ end }}
+`
+
+var terraformMarkdownTemplate = `
+{{ .Resolution }}
+
+{{ if .Terraform.GoodExamples }}{{ range .Terraform.GoodExamples }}` + "```hcl" + `{{ . }}
+` + "```" + `
+{{ end}}{{ end }}
+{{ if .Terraform.Links }}#### Remediation Links{{ range .Terraform.Links }}
+ - {{ . }}
+{{ end}}{{ end }}
+`
+
+var cloudformationMarkdownTemplate = `
+{{ .Resolution }}
+
+{{ if .CloudFormation.GoodExamples }}{{ range .CloudFormation.GoodExamples }}` + "```yaml" + `{{ . }}
+` + "```" + `
+{{ end}}{{ end }}
+{{ if .CloudFormation.Links }}#### Remediation Links{{ range .CloudFormation.Links }}
+ - {{ . }}
+{{ end}}{{ end }}
+`
diff --git a/cmd/avd_generator/main_test.go b/cmd/avd_generator/main_test.go
new file mode 100644
index 00000000..696166fb
--- /dev/null
+++ b/cmd/avd_generator/main_test.go
@@ -0,0 +1,85 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+	"runtime"
+	"testing"
+
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	registered "github.com/aquasecurity/trivy/pkg/iac/rules"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func init() { // change the pwd for the test to top level defesc dir
+	_, filename, _, _ := runtime.Caller(0)
+	dir := path.Join(path.Dir(filename), "../..")
+	err := os.Chdir(dir)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func Test_AVDPageGeneration(t *testing.T) {
+	tmpDir := t.TempDir()
+	defer func() {
+		os.RemoveAll(tmpDir)
+	}()
+
+	var generateCount int
+	for _, metadata := range registered.GetRegistered(framework.ALL) {
+		writeDocsFile(metadata, tmpDir)
+		generateCount++
+	}
+	fmt.Printf("\nGenerated %d files in avd_docs\n", generateCount)
+
+	// check golang policies
+	b, err := os.ReadFile(filepath.Join(tmpDir, "aws/rds/AVD-AWS-0077", "Terraform.md"))
+	require.NoError(t, err)
+	assert.Contains(t, string(b), `hcl
+ resource "aws_rds_cluster" "good_example" {
+ 	cluster_identifier      = "aurora-cluster-demo"
+ 	engine                  = "aurora-mysql"
+ 	engine_version          = "5.7.mysql_aurora.2.03.2"
+ 	availability_zones      = ["us-west-2a", "us-west-2b", "us-west-2c"]
+ 	database_name           = "mydb"
+ 	master_username         = "foo"
+ 	master_password         = "bar"
+ 	backup_retention_period = 5
+ 	preferred_backup_window = "07:00-09:00"
+   }`)
+
+	b, err = os.ReadFile(filepath.Join(tmpDir, "aws/rds/AVD-AWS-0077", "CloudFormation.md"))
+	require.NoError(t, err)
+	assert.Contains(t, string(b), `yaml---
+AWSTemplateFormatVersion: 2010-09-09
+Description: Good example
+Resources:
+  Queue:
+    Type: AWS::RDS::DBInstance
+    Properties:
+      BackupRetentionPeriod: 30
+`)
+
+	// check rego policies
+	b, err = os.ReadFile(filepath.Join(tmpDir, "aws/rds/AVD-AWS-0180", "Terraform.md"))
+	require.NoError(t, err)
+	assert.Contains(t, string(b), `hcl
+ resource "aws_db_instance" "good_example" {
+ 	publicly_accessible = false
+ }`)
+
+	b, err = os.ReadFile(filepath.Join(tmpDir, "aws/rds/AVD-AWS-0180", "CloudFormation.md"))
+	require.NoError(t, err)
+	assert.Contains(t, string(b), `yaml---
+AWSTemplateFormatVersion: 2010-09-09
+Description: Good example
+Resources:
+  Queue:
+    Type: AWS::RDS::DBInstance
+    Properties:
+      PubliclyAccessible: false`)
+}
diff --git a/cmd/id/main.go b/cmd/id/main.go
new file mode 100644
index 00000000..bab0713a
--- /dev/null
+++ b/cmd/id/main.go
@@ -0,0 +1,52 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+
+	_ "github.com/aquasecurity/trivy/pkg/iac/rego"
+	"github.com/aquasecurity/trivy/pkg/iac/rules"
+)
+
+func main() {
+
+	// organise existing rules by provider
+	keyMap := make(map[string][]string)
+	for _, rule := range rules.GetRegistered(framework.ALL) {
+		id := rule.GetRule().AVDID
+		if id == "" {
+			continue
+		}
+		parts := strings.Split(id, "-")
+		if len(parts) != 3 {
+			continue
+		}
+		keyMap[parts[1]] = append(keyMap[parts[1]], parts[2])
+	}
+
+	fmt.Print("\nThe following IDs are free - choose the one for the service you are targeting.\n\n")
+
+	var freeIDs []string
+	for key := range keyMap {
+		sort.Strings(keyMap[key])
+		all := keyMap[key]
+		max := all[len(all)-1]
+		i, err := strconv.Atoi(max)
+		if err != nil {
+			_, _ = fmt.Fprintf(os.Stderr, "Error, invalid AVD ID: AVD-%s-%s\n", key, max)
+		}
+		free := fmt.Sprintf("AVD-%s-%04d", key, i+1)
+		freeIDs = append(freeIDs, fmt.Sprintf("%16s: %s", key, free))
+	}
+
+	sort.Slice(freeIDs, func(i, j int) bool {
+		return strings.TrimSpace(freeIDs[i]) < strings.TrimSpace(freeIDs[j])
+	})
+	fmt.Println(strings.Join(freeIDs, "\n"))
+
+}
diff --git a/cmd/opa/main.go b/cmd/opa/main.go
index 0ac1cf21..dda37f07 100644
--- a/cmd/opa/main.go
+++ b/cmd/opa/main.go
@@ -5,11 +5,12 @@ import (
 	"os"
 
 	// register Built-in Functions from defsec
-	_ "github.com/aquasecurity/defsec/pkg/rego"
+	_ "github.com/aquasecurity/trivy/pkg/iac/rego"
 	"github.com/open-policy-agent/opa/cmd"
 )
 
 func main() {
+	// runs: opa test lib/ checks/
 	if err := cmd.RootCommand.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)

From b08df9b15da8d08a999869cd9ddfdc0dbd4039dc Mon Sep 17 00:00:00 2001
From: Simar <simar@linux.com>
Date: Tue, 20 Feb 2024 22:50:36 -0700
Subject: [PATCH 2/4] fix imports to use trivy pkgs

---
 .../accessanalyzer/enable_access_analyzer.go  |  12 +-
 .../enable_access_analyzer_test.go            |   8 +-
 .../aws/apigateway/enable_access_logging.go   |   8 +-
 .../apigateway/enable_access_logging_test.go  |   8 +-
 checks/cloud/aws/apigateway/enable_cache.go   |   8 +-
 .../aws/apigateway/enable_cache_encryption.go |   8 +-
 .../enable_cache_encryption_test.go           |   8 +-
 .../cloud/aws/apigateway/enable_cache_test.go |   8 +-
 checks/cloud/aws/apigateway/enable_tracing.go |   8 +-
 .../aws/apigateway/enable_tracing_test.go     |   8 +-
 .../cloud/aws/apigateway/no_public_access.go  |  10 +-
 .../aws/apigateway/no_public_access_test.go   |   8 +-
 .../aws/apigateway/use_secure_tls_policy.go   |   8 +-
 .../apigateway/use_secure_tls_policy_test.go  |   8 +-
 .../aws/athena/enable_at_rest_encryption.go   |  10 +-
 .../athena/enable_at_rest_encryption_test.go  |   8 +-
 .../aws/athena/no_encryption_override.go      |   8 +-
 .../aws/athena/no_encryption_override_test.go |   8 +-
 checks/cloud/aws/cloudfront/enable_logging.go |   8 +-
 .../aws/cloudfront/enable_logging_test.go     |   8 +-
 checks/cloud/aws/cloudfront/enable_waf.go     |   8 +-
 .../cloud/aws/cloudfront/enable_waf_test.go   |   8 +-
 checks/cloud/aws/cloudfront/enforce_https.go  |  10 +-
 .../aws/cloudfront/enforce_https_test.go      |   8 +-
 .../aws/cloudfront/use_secure_tls_policy.go   |  10 +-
 .../cloudfront/use_secure_tls_policy_test.go  |   8 +-
 .../aws/cloudtrail/enable_all_regions.go      |  10 +-
 .../aws/cloudtrail/enable_all_regions_test.go |   8 +-
 .../cloudtrail/enable_at_rest_encryption.go   |   8 +-
 .../enable_at_rest_encryption_test.go         |   8 +-
 .../aws/cloudtrail/enable_log_validation.go   |   8 +-
 .../cloudtrail/enable_log_validation_test.go  |   8 +-
 .../ensure_cloudwatch_integration.go          |  10 +-
 .../ensure_cloudwatch_integration_test.go     |   8 +-
 .../aws/cloudtrail/no_public_log_access.go    |  10 +-
 .../cloudtrail/no_public_log_access_test.go   |  10 +-
 .../require_bucket_access_logging.go          |  10 +-
 .../require_bucket_access_logging_test.go     |  10 +-
 .../aws/cloudwatch/log_group_customer_key.go  |   8 +-
 .../cloudwatch/log_group_customer_key_test.go |   8 +-
 .../require_cloudtrail_change_alarm.go        |  14 +-
 .../require_cloudtrail_change_alarm_test.go   |  10 +-
 .../cloudwatch/require_cmk_disabled_alarm.go  |  14 +-
 .../require_cmk_disabled_alarm_test.go        |  10 +-
 ...quire_config_configuration_change_alarm.go |  14 +-
 ..._config_configuration_change_alarm_test.go |  10 +-
 .../require_console_login_failure_alarm.go    |  14 +-
 ...equire_console_login_failure_alarm_test.go |  10 +-
 .../require_iam_policy_change_alarm.go        |  14 +-
 .../require_iam_policy_change_alarm_test.go   |  10 +-
 .../cloudwatch/require_nacl_change_alarm.go   |  14 +-
 .../require_nacl_change_alarm_test.go         |  10 +-
 .../require_network_gateway_change_alarm.go   |  14 +-
 ...quire_network_gateway_change_alarm_test.go |  10 +-
 .../cloudwatch/require_non_mfa_login_alarm.go |  14 +-
 .../require_non_mfa_login_alarm_test.go       |  10 +-
 .../cloudwatch/require_org_changes_alarm.go   |  14 +-
 .../require_org_changes_alarm_test.go         |  10 +-
 .../require_root_user_usage_alarm.go          |  14 +-
 .../require_root_user_usage_alarm_test.go     |  10 +-
 .../require_route_table_change_alarm.go       |  14 +-
 .../require_route_table_change_alarm_test.go  |  10 +-
 .../require_s3_bucket_policy_change_alarm.go  |  14 +-
 ...uire_s3_bucket_policy_change_alarm_test.go |  10 +-
 .../require_security_group_change_alarm.go    |  14 +-
 ...equire_security_group_change_alarm_test.go |  10 +-
 .../require_unauthorised_api_call_alarm.go    |  14 +-
 ...equire_unauthorised_api_call_alarm_test.go |  10 +-
 .../cloudwatch/require_vpc_change_alarm.go    |  14 +-
 .../require_vpc_change_alarm_test.go          |  10 +-
 .../cloud/aws/codebuild/enable_encryption.go  |   8 +-
 .../aws/codebuild/enable_encryption_test.go   |   8 +-
 .../cloud/aws/config/aggregate_all_regions.go |   8 +-
 .../aws/config/aggregate_all_regions_test.go  |   8 +-
 .../cloud/aws/documentdb/enable_log_export.go |  10 +-
 .../aws/documentdb/enable_log_export_test.go  |   8 +-
 .../documentdb/enable_storage_encryption.go   |   8 +-
 .../enable_storage_encryption_test.go         |   8 +-
 .../aws/documentdb/encryption_customer_key.go |   8 +-
 .../encryption_customer_key_test.go           |   8 +-
 .../aws/dynamodb/enable_at_rest_encryption.go |   8 +-
 .../enable_at_rest_encryption_test.go         |   8 +-
 checks/cloud/aws/dynamodb/enable_recovery.go  |   8 +-
 .../aws/dynamodb/enable_recovery_test.go      |   8 +-
 .../cloud/aws/dynamodb/table_customer_key.go  |  10 +-
 .../aws/dynamodb/table_customer_key_test.go   |   8 +-
 .../ec2/add_description_to_security_group.go  |   8 +-
 .../add_description_to_security_group_rule.go |   8 +-
 ...description_to_security_group_rule_test.go |   8 +-
 .../add_description_to_security_group_test.go |   8 +-
 .../aws/ec2/as_enable_at_rest_encryption.go   |   8 +-
 .../ec2/as_enable_at_rest_encryption_test.go  |   8 +-
 .../aws/ec2/as_enforce_http_token_imds.go     |   8 +-
 .../ec2/as_enforce_http_token_imds_test.go    |   8 +-
 .../aws/ec2/as_no_secrets_in_user_data.go     |   8 +-
 .../ec2/as_no_secrets_in_user_data_test.go    |   8 +-
 .../aws/ec2/enable_at_rest_encryption.go      |   8 +-
 .../aws/ec2/enable_at_rest_encryption_test.go |   8 +-
 .../cloud/aws/ec2/enable_volume_encryption.go |   8 +-
 .../aws/ec2/enable_volume_encryption_test.go  |   8 +-
 .../cloud/aws/ec2/encryption_customer_key.go  |   8 +-
 .../aws/ec2/encryption_customer_key_test.go   |   8 +-
 .../cloud/aws/ec2/enforce_http_token_imds.go  |   8 +-
 .../aws/ec2/enforce_http_token_imds_test.go   |   8 +-
 checks/cloud/aws/ec2/no_default_vpc.go        |   8 +-
 checks/cloud/aws/ec2/no_default_vpc_test.go   |   8 +-
 .../cloud/aws/ec2/no_excessive_port_access.go |   8 +-
 .../aws/ec2/no_excessive_port_access_test.go  |   8 +-
 checks/cloud/aws/ec2/no_public_egress_sgr.go  |   8 +-
 .../aws/ec2/no_public_egress_sgr_test.go      |   8 +-
 checks/cloud/aws/ec2/no_public_ingress_acl.go |  10 +-
 .../aws/ec2/no_public_ingress_acl_test.go     |   8 +-
 checks/cloud/aws/ec2/no_public_ingress_sgr.go |  10 +-
 .../aws/ec2/no_public_ingress_sgr_test.go     |   8 +-
 checks/cloud/aws/ec2/no_public_ip.go          |   8 +-
 checks/cloud/aws/ec2/no_public_ip_subnet.go   |   8 +-
 .../cloud/aws/ec2/no_public_ip_subnet_test.go |   8 +-
 checks/cloud/aws/ec2/no_public_ip_test.go     |   8 +-
 .../cloud/aws/ec2/no_secrets_in_user_data.go  |   8 +-
 .../aws/ec2/no_secrets_in_user_data_test.go   |   8 +-
 checks/cloud/aws/ec2/no_sensitive_info.go     |   8 +-
 .../cloud/aws/ec2/no_sensitive_info_test.go   |   8 +-
 .../ec2/require_vpc_flow_logs_for_all_vpcs.go |   8 +-
 ...require_vpc_flow_logs_for_all_vpcs_test.go |   8 +-
 .../aws/ec2/restrict_all_in_default_sg.go     |  10 +-
 .../ec2/restrict_all_in_default_sg_test.go    |   8 +-
 checks/cloud/aws/ecr/enable_image_scans.go    |   8 +-
 .../cloud/aws/ecr/enable_image_scans_test.go  |   8 +-
 .../aws/ecr/enforce_immutable_repository.go   |   8 +-
 .../ecr/enforce_immutable_repository_test.go  |   8 +-
 checks/cloud/aws/ecr/no_public_access.go      |   8 +-
 checks/cloud/aws/ecr/no_public_access_test.go |  10 +-
 .../cloud/aws/ecr/repository_customer_key.go  |  10 +-
 .../aws/ecr/repository_customer_key_test.go   |   8 +-
 .../cloud/aws/ecs/enable_container_insight.go |   8 +-
 .../aws/ecs/enable_container_insight_test.go  |   8 +-
 .../aws/ecs/enable_in_transit_encryption.go   |   8 +-
 .../ecs/enable_in_transit_encryption_test.go  |   8 +-
 checks/cloud/aws/ecs/no_plaintext_secrets.go  |   8 +-
 .../aws/ecs/no_plaintext_secrets_test.go      |   8 +-
 .../aws/efs/enable_at_rest_encryption.go      |   8 +-
 .../aws/efs/enable_at_rest_encryption_test.go |   8 +-
 .../aws/eks/enable_control_plane_logging.go   |   8 +-
 .../eks/enable_control_plane_logging_test.go  |   8 +-
 checks/cloud/aws/eks/encrypt_secrets.go       |   8 +-
 checks/cloud/aws/eks/encrypt_secrets_test.go  |   8 +-
 .../cloud/aws/eks/no_public_cluster_access.go |   8 +-
 .../aws/eks/no_public_cluster_access_test.go  |   8 +-
 .../eks/no_public_cluster_access_to_cidr.go   |   8 +-
 .../no_public_cluster_access_to_cidr_test.go  |   8 +-
 .../add_description_for_security_group.go     |   8 +-
 ...add_description_for_security_group_test.go |   8 +-
 .../elasticache/enable_at_rest_encryption.go  |   8 +-
 .../enable_at_rest_encryption_test.go         |   8 +-
 .../elasticache/enable_backup_retention.go    |   8 +-
 .../enable_backup_retention_test.go           |   8 +-
 .../enable_in_transit_encryption.go           |   8 +-
 .../enable_in_transit_encryption_test.go      |   8 +-
 .../elasticsearch/enable_domain_encryption.go |   8 +-
 .../enable_domain_encryption_test.go          |   8 +-
 .../elasticsearch/enable_domain_logging.go    |   8 +-
 .../enable_domain_logging_test.go             |   8 +-
 .../enable_in_transit_encryption.go           |   8 +-
 .../enable_in_transit_encryption_test.go      |   8 +-
 .../cloud/aws/elasticsearch/enforce_https.go  |   8 +-
 .../aws/elasticsearch/enforce_https_test.go   |   8 +-
 .../elasticsearch/use_secure_tls_policy.go    |   8 +-
 .../use_secure_tls_policy_test.go             |   8 +-
 checks/cloud/aws/elb/alb_not_public.go        |  10 +-
 checks/cloud/aws/elb/alb_not_public_test.go   |   8 +-
 checks/cloud/aws/elb/drop_invalid_headers.go  |  10 +-
 .../aws/elb/drop_invalid_headers_test.go      |   8 +-
 checks/cloud/aws/elb/http_not_used.go         |  10 +-
 checks/cloud/aws/elb/http_not_used_test.go    |   8 +-
 checks/cloud/aws/elb/use_secure_tls_policy.go |   8 +-
 .../aws/elb/use_secure_tls_policy_test.go     |   8 +-
 .../aws/emr/enable_at_rest_encryption.go      |   8 +-
 .../aws/emr/enable_at_rest_encryption_test.go |   8 +-
 .../aws/emr/enable_in_transit_encryption.go   |   8 +-
 .../emr/enable_in_transit_encryption_test.go  |   8 +-
 .../aws/emr/enable_local_disk_encryption.go   |   8 +-
 .../emr/enable_local_disk_encryption_test.go  |   8 +-
 .../aws/iam/disable_unused_credentials.go     |  10 +-
 .../aws/iam/disable_unused_credentials_45.go  |  10 +-
 .../iam/disable_unused_credentials_45_test.go |   8 +-
 .../iam/disable_unused_credentials_test.go    |   8 +-
 checks/cloud/aws/iam/enforce_group_mfa.go     |   8 +-
 .../cloud/aws/iam/enforce_group_mfa_test.go   |   8 +-
 .../aws/iam/enforce_root_hardware_mfa.go      |  10 +-
 .../aws/iam/enforce_root_hardware_mfa_test.go |   8 +-
 checks/cloud/aws/iam/enforce_root_mfa.go      |  10 +-
 checks/cloud/aws/iam/enforce_root_mfa_test.go |   8 +-
 checks/cloud/aws/iam/enforce_user_mfa.go      |  10 +-
 checks/cloud/aws/iam/enforce_user_mfa_test.go |   8 +-
 .../cloud/aws/iam/limit_root_account_usage.go |  10 +-
 .../aws/iam/limit_root_account_usage_test.go  |   8 +-
 .../cloud/aws/iam/limit_user_access_keys.go   |  10 +-
 .../aws/iam/limit_user_access_keys_test.go    |   8 +-
 checks/cloud/aws/iam/no_password_reuse.go     |  10 +-
 .../cloud/aws/iam/no_password_reuse_test.go   |   8 +-
 checks/cloud/aws/iam/no_policy_wildcards.go   |  12 +-
 .../cloud/aws/iam/no_policy_wildcards_test.go |   8 +-
 checks/cloud/aws/iam/no_root_access_keys.go   |  10 +-
 .../cloud/aws/iam/no_root_access_keys_test.go |   8 +-
 .../aws/iam/no_user_attached_policies.go      |  10 +-
 .../aws/iam/no_user_attached_policies_test.go |   8 +-
 .../aws/iam/remove_expired_certificates.go    |  10 +-
 .../iam/remove_expired_certificates_test.go   |   8 +-
 .../aws/iam/require_lowercase_in_passwords.go |  10 +-
 .../require_lowercase_in_passwords_test.go    |   8 +-
 .../aws/iam/require_numbers_in_passwords.go   |  10 +-
 .../iam/require_numbers_in_passwords_test.go  |   8 +-
 checks/cloud/aws/iam/require_support_role.go  |  12 +-
 .../aws/iam/require_support_role_test.go      |   8 +-
 .../aws/iam/require_symbols_in_passwords.go   |  10 +-
 .../iam/require_symbols_in_passwords_test.go  |   8 +-
 .../aws/iam/require_uppercase_in_passwords.go |  10 +-
 .../require_uppercase_in_passwords_test.go    |   8 +-
 checks/cloud/aws/iam/rotate_access_keys.go    |  10 +-
 .../cloud/aws/iam/rotate_access_keys_test.go  |   8 +-
 checks/cloud/aws/iam/set_max_password_age.go  |  10 +-
 .../aws/iam/set_max_password_age_test.go      |   8 +-
 .../aws/iam/set_minimum_password_length.go    |  10 +-
 .../iam/set_minimum_password_length_test.go   |   8 +-
 .../kinesis/enable_in_transit_encryption.go   |  10 +-
 .../enable_in_transit_encryption_test.go      |   8 +-
 checks/cloud/aws/kms/auto_rotate_keys.go      |  10 +-
 checks/cloud/aws/kms/auto_rotate_keys_test.go |   8 +-
 checks/cloud/aws/lambda/enable_tracing.go     |  10 +-
 .../cloud/aws/lambda/enable_tracing_test.go   |   8 +-
 .../cloud/aws/lambda/restrict_source_arn.go   |   8 +-
 .../aws/lambda/restrict_source_arn_test.go    |   8 +-
 checks/cloud/aws/mq/enable_audit_logging.go   |   8 +-
 .../cloud/aws/mq/enable_audit_logging_test.go |   8 +-
 checks/cloud/aws/mq/enable_general_logging.go |   8 +-
 .../aws/mq/enable_general_logging_test.go     |   8 +-
 checks/cloud/aws/mq/no_public_access.go       |   8 +-
 checks/cloud/aws/mq/no_public_access_test.go  |   8 +-
 .../aws/msk/enable_at_rest_encryption.go      |   8 +-
 .../aws/msk/enable_at_rest_encryption_test.go |   8 +-
 .../aws/msk/enable_in_transit_encryption.go   |  10 +-
 .../msk/enable_in_transit_encryption_test.go  |   8 +-
 checks/cloud/aws/msk/enable_logging.go        |   8 +-
 checks/cloud/aws/msk/enable_logging_test.go   |   8 +-
 checks/cloud/aws/neptune/enable_log_export.go |   8 +-
 .../aws/neptune/enable_log_export_test.go     |   8 +-
 .../aws/neptune/enable_storage_encryption.go  |   8 +-
 .../neptune/enable_storage_encryption_test.go |   8 +-
 .../aws/neptune/encryption_customer_key.go    |   8 +-
 .../neptune/encryption_customer_key_test.go   |   8 +-
 .../aws/rds/enable_performance_insights.go    |   8 +-
 .../rds/enable_performance_insights_test.go   |   8 +-
 .../aws/rds/encrypt_cluster_storage_data.go   |   8 +-
 .../rds/encrypt_cluster_storage_data_test.go  |   8 +-
 .../aws/rds/encrypt_instance_storage_data.go  |   8 +-
 .../rds/encrypt_instance_storage_data_test.go |   8 +-
 checks/cloud/aws/rds/no_classic_resources.go  |   8 +-
 .../aws/rds/no_classic_resources_test.go      |   8 +-
 ...rmance_insights_encryption_customer_key.go |  10 +-
 ...e_insights_encryption_customer_key_test.go |   8 +-
 .../cloud/aws/rds/specify_backup_retention.go |   8 +-
 .../aws/rds/specify_backup_retention_test.go  |   8 +-
 .../add_description_to_security_group.go      |   8 +-
 .../add_description_to_security_group_test.go |   8 +-
 .../aws/redshift/encryption_customer_key.go   |   8 +-
 .../redshift/encryption_customer_key_test.go  |   8 +-
 .../aws/redshift/no_classic_resources.go      |   8 +-
 .../aws/redshift/no_classic_resources_test.go |   8 +-
 checks/cloud/aws/redshift/use_vpc.go          |   8 +-
 checks/cloud/aws/redshift/use_vpc_test.go     |   8 +-
 checks/cloud/aws/s3/block_public_acls.go      |   8 +-
 checks/cloud/aws/s3/block_public_acls_test.go |   8 +-
 checks/cloud/aws/s3/block_public_policy.go    |   8 +-
 .../cloud/aws/s3/block_public_policy_test.go  |   8 +-
 .../cloud/aws/s3/enable_bucket_encryption.go  |   8 +-
 .../aws/s3/enable_bucket_encryption_test.go   |   8 +-
 .../aws/s3/enable_object_read_logging.go      |  10 +-
 .../aws/s3/enable_object_read_logging_test.go |  10 +-
 .../aws/s3/enable_object_write_logging.go     |  10 +-
 .../s3/enable_object_write_logging_test.go    |  10 +-
 checks/cloud/aws/s3/enable_versioning.go      |   8 +-
 checks/cloud/aws/s3/enable_versioning_test.go |   8 +-
 .../cloud/aws/s3/encryption_customer_key.go   |  10 +-
 .../aws/s3/encryption_customer_key_test.go    |   8 +-
 checks/cloud/aws/s3/ignore_public_acls.go     |   8 +-
 .../cloud/aws/s3/ignore_public_acls_test.go   |   8 +-
 .../cloud/aws/s3/no_public_access_with_acl.go |   8 +-
 .../aws/s3/no_public_access_with_acl_test.go  |   8 +-
 checks/cloud/aws/s3/no_public_buckets.go      |   8 +-
 checks/cloud/aws/s3/no_public_buckets_test.go |   8 +-
 checks/cloud/aws/s3/require_mfa_delete.go     |  10 +-
 .../cloud/aws/s3/require_mfa_delete_test.go   |   8 +-
 .../aws/s3/specify_public_access_block.go     |   8 +-
 .../s3/specify_public_access_block_test.go    |   8 +-
 .../aws/sam/api_use_secure_tls_policy.go      |   8 +-
 .../aws/sam/api_use_secure_tls_policy_test.go |   8 +-
 .../aws/sam/enable_api_access_logging.go      |   8 +-
 .../aws/sam/enable_api_access_logging_test.go |   8 +-
 .../aws/sam/enable_api_cache_encryption.go    |   8 +-
 .../sam/enable_api_cache_encryption_test.go   |   8 +-
 checks/cloud/aws/sam/enable_api_tracing.go    |   8 +-
 .../cloud/aws/sam/enable_api_tracing_test.go  |   8 +-
 .../cloud/aws/sam/enable_function_tracing.go  |  10 +-
 .../aws/sam/enable_function_tracing_test.go   |   8 +-
 .../aws/sam/enable_http_api_access_logging.go |   8 +-
 .../enable_http_api_access_logging_test.go    |   8 +-
 .../aws/sam/enable_state_machine_logging.go   |   8 +-
 .../sam/enable_state_machine_logging_test.go  |   8 +-
 .../aws/sam/enable_state_machine_tracing.go   |   8 +-
 .../sam/enable_state_machine_tracing_test.go  |   8 +-
 .../cloud/aws/sam/enable_table_encryption.go  |   8 +-
 .../aws/sam/enable_table_encryption_test.go   |   8 +-
 .../aws/sam/no_function_policy_wildcards.go   |  10 +-
 .../sam/no_function_policy_wildcards_test.go  |  10 +-
 .../sam/no_state_machine_policy_wildcards.go  |   8 +-
 .../no_state_machine_policy_wildcards_test.go |  10 +-
 .../cloud/aws/sns/enable_topic_encryption.go  |   8 +-
 .../aws/sns/enable_topic_encryption_test.go   |   8 +-
 .../aws/sns/topic_encryption_with_cmk.go      |   8 +-
 .../aws/sns/topic_encryption_with_cmk_test.go |   8 +-
 .../cloud/aws/sqs/enable_queue_encryption.go  |   8 +-
 .../aws/sqs/enable_queue_encryption_test.go   |   8 +-
 .../sqs/no_wildcards_in_policy_documents.go   |   8 +-
 .../no_wildcards_in_policy_documents_test.go  |  10 +-
 .../aws/sqs/queue_encryption_with_cmk.go      |   8 +-
 .../aws/sqs/queue_encryption_with_cmk_test.go |   8 +-
 checks/cloud/aws/ssm/avoid_leaks_via_http.go  |   8 +-
 .../cloud/aws/ssm/secret_use_customer_key.go  |  10 +-
 .../aws/ssm/secret_use_customer_key_test.go   |   8 +-
 .../aws/workspaces/enable_disk_encryption.go  |   8 +-
 .../workspaces/enable_disk_encryption_test.go |   8 +-
 .../appservice/account_identity_registered.go |   8 +-
 .../account_identity_registered_test.go       |   8 +-
 .../appservice/authentication_enabled.go      |   8 +-
 .../appservice/authentication_enabled_test.go |   8 +-
 checks/cloud/azure/appservice/enable_http2.go |   8 +-
 .../azure/appservice/enable_http2_test.go     |   8 +-
 .../cloud/azure/appservice/enforce_https.go   |   8 +-
 .../azure/appservice/enforce_https_test.go    |   8 +-
 .../azure/appservice/require_client_cert.go   |   8 +-
 .../appservice/require_client_cert_test.go    |   8 +-
 .../azure/appservice/use_secure_tls_policy.go |   8 +-
 .../appservice/use_secure_tls_policy_test.go  |   8 +-
 .../azure/authorization/limit_role_actions.go |   8 +-
 .../authorization/limit_role_actions_test.go  |   8 +-
 .../disable_password_authentication.go        |   8 +-
 .../disable_password_authentication_test.go   |   8 +-
 .../azure/compute/enable_disk_encryption.go   |   8 +-
 .../compute/enable_disk_encryption_test.go    |   8 +-
 .../compute/no_secrets_in_custom_data.go      |   8 +-
 .../compute/no_secrets_in_custom_data_test.go |   8 +-
 .../container/configured_network_policy.go    |   8 +-
 .../configured_network_policy_test.go         |   8 +-
 .../azure/container/limit_authorized_ips.go   |   8 +-
 .../container/limit_authorized_ips_test.go    |   8 +-
 checks/cloud/azure/container/logging.go       |   8 +-
 checks/cloud/azure/container/logging_test.go  |   8 +-
 .../azure/container/use_rbac_permissions.go   |   8 +-
 .../container/use_rbac_permissions_test.go    |   8 +-
 .../database/all_threat_alerts_enabled.go     |   8 +-
 .../all_threat_alerts_enabled_test.go         |   8 +-
 checks/cloud/azure/database/enable_audit.go   |   8 +-
 .../cloud/azure/database/enable_audit_test.go |   8 +-
 .../azure/database/enable_ssl_enforcement.go  |   8 +-
 .../database/enable_ssl_enforcement_test.go   |   8 +-
 .../cloud/azure/database/no_public_access.go  |   8 +-
 .../azure/database/no_public_access_test.go   |   8 +-
 .../database/no_public_firewall_access.go     |  10 +-
 .../no_public_firewall_access_test.go         |   8 +-
 ...res_configuration_connection_throttling.go |   8 +-
 ...onfiguration_connection_throttling_test.go |   8 +-
 .../postgres_configuration_log_checkpoints.go |   8 +-
 ...gres_configuration_log_checkpoints_test.go |   8 +-
 .../postgres_configuration_log_connections.go |   8 +-
 ...gres_configuration_log_connections_test.go |   8 +-
 .../azure/database/retention_period_set.go    |   8 +-
 .../database/retention_period_set_test.go     |   8 +-
 .../cloud/azure/database/secure_tls_policy.go |   8 +-
 .../azure/database/secure_tls_policy_test.go  |   8 +-
 .../azure/database/threat_alert_email_set.go  |   8 +-
 .../database/threat_alert_email_set_test.go   |   8 +-
 .../database/threat_alert_email_to_owner.go   |   8 +-
 .../threat_alert_email_to_owner_test.go       |   8 +-
 .../azure/datafactory/no_public_access.go     |   8 +-
 .../datafactory/no_public_access_test.go      |   8 +-
 .../datalake/enable_at_rest_encryption.go     |   8 +-
 .../enable_at_rest_encryption_test.go         |   8 +-
 .../azure/keyvault/content_type_for_secret.go |   8 +-
 .../keyvault/content_type_for_secret_test.go  |   8 +-
 .../cloud/azure/keyvault/ensure_key_expiry.go |   8 +-
 .../azure/keyvault/ensure_key_expiry_test.go  |   8 +-
 .../azure/keyvault/ensure_secret_expiry.go    |   8 +-
 .../keyvault/ensure_secret_expiry_test.go     |   8 +-
 checks/cloud/azure/keyvault/no_purge.go       |   8 +-
 checks/cloud/azure/keyvault/no_purge_test.go  |   8 +-
 .../azure/keyvault/specify_network_acl.go     |   8 +-
 .../keyvault/specify_network_acl_test.go      |   8 +-
 .../monitor/activity_log_retention_set.go     |   8 +-
 .../activity_log_retention_set_test.go        |   8 +-
 .../azure/monitor/capture_all_activities.go   |  10 +-
 .../monitor/capture_all_activities_test.go    |   8 +-
 .../azure/monitor/capture_all_regions.go      |  10 +-
 .../azure/monitor/capture_all_regions_test.go |   8 +-
 .../network/disable_rdp_from_internet.go      |  10 +-
 .../network/disable_rdp_from_internet_test.go |   8 +-
 .../cloud/azure/network/no_public_egress.go   |   8 +-
 .../azure/network/no_public_egress_test.go    |   8 +-
 .../cloud/azure/network/no_public_ingress.go  |   8 +-
 .../azure/network/no_public_ingress_test.go   |   8 +-
 .../azure/network/retention_policy_set.go     |   8 +-
 .../network/retention_policy_set_test.go      |   8 +-
 .../network/ssh_blocked_from_internet.go      |  10 +-
 .../network/ssh_blocked_from_internet_test.go |   8 +-
 .../alert_on_severe_notifications.go          |   8 +-
 .../alert_on_severe_notifications_test.go     |   8 +-
 .../enable_standard_subscription.go           |  10 +-
 .../enable_standard_subscription_test.go      |   8 +-
 .../set_required_contact_details.go           |   8 +-
 .../set_required_contact_details_test.go      |   8 +-
 .../storage/allow_microsoft_service_bypass.go |   8 +-
 .../allow_microsoft_service_bypass_test.go    |   8 +-
 .../azure/storage/default_action_deny.go      |   8 +-
 .../azure/storage/default_action_deny_test.go |   8 +-
 checks/cloud/azure/storage/enforce_https.go   |   8 +-
 .../cloud/azure/storage/enforce_https_test.go |   8 +-
 .../cloud/azure/storage/no_public_access.go   |  10 +-
 .../azure/storage/no_public_access_test.go    |   8 +-
 .../storage/queue_services_logging_enabled.go |   8 +-
 .../queue_services_logging_enabled_test.go    |   8 +-
 .../azure/storage/use_secure_tls_policy.go    |   8 +-
 .../storage/use_secure_tls_policy_test.go     |   8 +-
 .../azure/synapse/virtual_network_enabled.go  |   8 +-
 .../synapse/virtual_network_enabled_test.go   |   8 +-
 .../cloudstack/compute/no_sensitive_info.go   |   8 +-
 .../compute/no_sensitive_info_test.go         |   8 +-
 .../auto_upgrade_no_maintenance_policy.go     |   8 +-
 ...auto_upgrade_no_maintenance_policy_test.go |   8 +-
 .../digitalocean/compute/enforce_https.go     |   8 +-
 .../compute/enforce_https_test.go             |   8 +-
 .../compute/kubernetes_surge_upgrades.go      |   8 +-
 .../compute/kubernetes_surge_upgrades_test.go |   8 +-
 .../digitalocean/compute/no_public_egress.go  |   8 +-
 .../compute/no_public_egress_test.go          |   8 +-
 .../digitalocean/compute/no_public_ingress.go |   8 +-
 .../compute/no_public_ingress_test.go         |   8 +-
 .../digitalocean/compute/use_ssh_keys.go      |   8 +-
 .../digitalocean/compute/use_ssh_keys_test.go |   8 +-
 .../digitalocean/spaces/acl_no_public_read.go |   8 +-
 .../spaces/acl_no_public_read_test.go         |   8 +-
 .../spaces/disable_force_destroy.go           |   8 +-
 .../spaces/disable_force_destroy_test.go      |   8 +-
 .../digitalocean/spaces/versioning_enabled.go |   8 +-
 .../spaces/versioning_enabled_test.go         |   8 +-
 .../actions/no_plain_text_action_secrets.go   |   8 +-
 .../no_plain_text_action_secrets_test.go      |   8 +-
 .../require_signed_commits.go                 |   8 +-
 .../require_signed_commits_test.go            |   8 +-
 .../enable_vulnerability_alerts.go            |   8 +-
 .../enable_vulnerability_alerts_test.go       |   8 +-
 checks/cloud/github/repositories/private.go   |   8 +-
 .../cloud/github/repositories/private_test.go |   8 +-
 .../cloud/google/bigquery/no_public_access.go |  10 +-
 .../google/bigquery/no_public_access_test.go  |   8 +-
 .../compute/disk_encryption_customer_key.go   |   8 +-
 .../disk_encryption_customer_key_test.go      |   8 +-
 .../disk_encryption_no_plaintext_key.go       |   8 +-
 .../disk_encryption_no_plaintext_key_test.go  |   8 +-
 .../google/compute/enable_shielded_vm_im.go   |   8 +-
 .../compute/enable_shielded_vm_im_test.go     |   8 +-
 .../google/compute/enable_shielded_vm_sb.go   |   8 +-
 .../compute/enable_shielded_vm_sb_test.go     |   8 +-
 .../google/compute/enable_shielded_vm_vtpm.go |   8 +-
 .../compute/enable_shielded_vm_vtpm_test.go   |   8 +-
 .../google/compute/enable_vpc_flow_logs.go    |   8 +-
 .../compute/enable_vpc_flow_logs_test.go      |   8 +-
 .../compute/no_default_service_account.go     |   8 +-
 .../no_default_service_account_test.go        |   8 +-
 .../cloud/google/compute/no_ip_forwarding.go  |   8 +-
 .../google/compute/no_ip_forwarding_test.go   |   8 +-
 .../google/compute/no_oslogin_override.go     |   8 +-
 .../compute/no_oslogin_override_test.go       |   8 +-
 .../compute/no_project_wide_ssh_keys.go       |   8 +-
 .../compute/no_project_wide_ssh_keys_test.go  |   8 +-
 .../cloud/google/compute/no_public_egress.go  |   8 +-
 .../google/compute/no_public_egress_test.go   |   8 +-
 .../cloud/google/compute/no_public_ingress.go |   8 +-
 .../google/compute/no_public_ingress_test.go  |   8 +-
 checks/cloud/google/compute/no_public_ip.go   |   8 +-
 .../cloud/google/compute/no_public_ip_test.go |   8 +-
 checks/cloud/google/compute/no_serial_port.go |   8 +-
 .../google/compute/no_serial_port_test.go     |   8 +-
 .../google/compute/project_level_oslogin.go   |   8 +-
 .../compute/project_level_oslogin_test.go     |   8 +-
 .../google/compute/use_secure_tls_policy.go   |   8 +-
 .../compute/use_secure_tls_policy_test.go     |   8 +-
 .../vm_disk_encryption_customer_key.go        |   8 +-
 .../vm_disk_encryption_customer_key_test.go   |   8 +-
 checks/cloud/google/dns/enable_dnssec.go      |   8 +-
 checks/cloud/google/dns/enable_dnssec_test.go |   8 +-
 checks/cloud/google/dns/no_rsa_sha1.go        |   8 +-
 checks/cloud/google/dns/no_rsa_sha1_test.go   |   8 +-
 checks/cloud/google/gke/enable_auto_repair.go |   8 +-
 .../google/gke/enable_auto_repair_test.go     |   8 +-
 .../cloud/google/gke/enable_auto_upgrade.go   |   8 +-
 .../google/gke/enable_auto_upgrade_test.go    |   8 +-
 checks/cloud/google/gke/enable_ip_aliasing.go |   8 +-
 .../google/gke/enable_ip_aliasing_test.go     |   8 +-
 .../google/gke/enable_master_networks.go      |   8 +-
 .../google/gke/enable_master_networks_test.go |   8 +-
 .../cloud/google/gke/enable_network_policy.go |   8 +-
 .../google/gke/enable_network_policy_test.go  |   8 +-
 .../google/gke/enable_private_cluster.go      |   8 +-
 .../google/gke/enable_private_cluster_test.go |   8 +-
 .../google/gke/enable_stackdriver_logging.go  |   8 +-
 .../gke/enable_stackdriver_logging_test.go    |   8 +-
 .../gke/enable_stackdriver_monitoring.go      |   8 +-
 .../gke/enable_stackdriver_monitoring_test.go |   8 +-
 .../google/gke/metadata_endpoints_disabled.go |   8 +-
 .../gke/metadata_endpoints_disabled_test.go   |   8 +-
 .../google/gke/no_legacy_authentication.go    |   8 +-
 .../gke/no_legacy_authentication_test.go      |   8 +-
 .../google/gke/no_public_control_plane.go     |   8 +-
 .../gke/no_public_control_plane_test.go       |   8 +-
 .../google/gke/node_metadata_security.go      |   8 +-
 .../google/gke/node_metadata_security_test.go |   8 +-
 checks/cloud/google/gke/node_pool_uses_cos.go |  10 +-
 .../google/gke/node_pool_uses_cos_test.go     |   8 +-
 .../google/gke/node_shielding_enabled.go      |   8 +-
 .../google/gke/node_shielding_enabled_test.go |   8 +-
 checks/cloud/google/gke/use_cluster_labels.go |   8 +-
 .../google/gke/use_cluster_labels_test.go     |   8 +-
 .../cloud/google/gke/use_rbac_permissions.go  |   8 +-
 .../google/gke/use_rbac_permissions_test.go   |   8 +-
 .../cloud/google/gke/use_service_account.go   |   8 +-
 .../google/gke/use_service_account_test.go    |   8 +-
 ...ions_on_workload_identity_pool_provider.go |   8 +-
 ...on_workload_identity_pool_provider_test.go |   8 +-
 checks/cloud/google/iam/no_default_network.go |   8 +-
 .../google/iam/no_default_network_test.go     |   8 +-
 ...evel_default_service_account_assignment.go |   8 +-
 ...default_service_account_assignment_test.go |   8 +-
 ...der_level_service_account_impersonation.go |   8 +-
 ...evel_service_account_impersonation_test.go |   8 +-
 ...evel_default_service_account_assignment.go |   8 +-
 ...default_service_account_assignment_test.go |   8 +-
 ...org_level_service_account_impersonation.go |   8 +-
 ...evel_service_account_impersonation_test.go |   8 +-
 .../iam/no_privileged_service_accounts.go     |   8 +-
 .../no_privileged_service_accounts_test.go    |   8 +-
 ...evel_default_service_account_assignment.go |   8 +-
 ...default_service_account_assignment_test.go |   8 +-
 ...ect_level_service_account_impersonation.go |   8 +-
 ...evel_service_account_impersonation_test.go |   8 +-
 .../google/iam/no_user_granted_permissions.go |   8 +-
 .../iam/no_user_granted_permissions_test.go   |   8 +-
 checks/cloud/google/kms/rotate_kms_keys.go    |   8 +-
 .../cloud/google/kms/rotate_kms_keys_test.go  |   8 +-
 checks/cloud/google/sql/enable_backup.go      |   8 +-
 checks/cloud/google/sql/enable_backup_test.go |   8 +-
 .../google/sql/enable_pg_temp_file_logging.go |  10 +-
 .../sql/enable_pg_temp_file_logging_test.go   |   8 +-
 .../google/sql/encrypt_in_transit_data.go     |   8 +-
 .../sql/encrypt_in_transit_data_test.go       |   8 +-
 .../cloud/google/sql/mysql_no_local_infile.go |  10 +-
 .../google/sql/mysql_no_local_infile_test.go  |   8 +-
 .../cloud/google/sql/no_contained_db_auth.go  |  10 +-
 .../google/sql/no_contained_db_auth_test.go   |   8 +-
 .../sql/no_cross_db_ownership_chaining.go     |  10 +-
 .../no_cross_db_ownership_chaining_test.go    |   8 +-
 checks/cloud/google/sql/no_public_access.go   |   8 +-
 .../cloud/google/sql/no_public_access_test.go |   8 +-
 checks/cloud/google/sql/pg_log_checkpoints.go |  10 +-
 .../google/sql/pg_log_checkpoints_test.go     |   8 +-
 checks/cloud/google/sql/pg_log_connections.go |  10 +-
 .../google/sql/pg_log_connections_test.go     |   8 +-
 .../cloud/google/sql/pg_log_disconnections.go |  10 +-
 .../google/sql/pg_log_disconnections_test.go  |   8 +-
 checks/cloud/google/sql/pg_log_errors.go      |  10 +-
 checks/cloud/google/sql/pg_log_errors_test.go |   8 +-
 checks/cloud/google/sql/pg_log_lock_waits.go  |  10 +-
 .../google/sql/pg_log_lock_waits_test.go      |   8 +-
 .../google/sql/pg_no_min_statement_logging.go |  10 +-
 .../sql/pg_no_min_statement_logging_test.go   |   8 +-
 .../storage/bucket_encryption_customer_key.go |   8 +-
 .../bucket_encryption_customer_test.go        |   8 +-
 checks/cloud/google/storage/enable_ubla.go    |   8 +-
 .../cloud/google/storage/enable_ubla_test.go  |   8 +-
 .../cloud/google/storage/no_public_access.go  |   8 +-
 .../google/storage/no_public_access_test.go   |  10 +-
 .../add_description_to_security_group.go      |   8 +-
 .../add_description_to_security_group_rule.go |   8 +-
 ...description_to_security_group_rule_test.go |   8 +-
 .../add_description_to_security_group_test.go |   8 +-
 .../add_security_group_to_instance.go         |   8 +-
 .../add_security_group_to_instance_test.go    |   8 +-
 .../computing/no_common_private_instance.go   |   8 +-
 .../no_common_private_instance_test.go        |   8 +-
 .../computing/no_public_ingress_sgr.go        |   8 +-
 .../computing/no_public_ingress_sgr_test.go   |   8 +-
 .../nifcloud/dns/remove_verified_record.go    |  10 +-
 .../dns/remove_verified_record_test.go        |   8 +-
 .../add_description_to_nas_security_group.go  |   8 +-
 ..._description_to_nas_security_group_test.go |   8 +-
 .../nas/no_common_private_nas_instance.go     |   8 +-
 .../no_common_private_nas_instance_test.go    |   8 +-
 .../nifcloud/nas/no_public_ingress_nas_sgr.go |   8 +-
 .../nas/no_public_ingress_nas_sgr_test.go     |   8 +-
 .../network/add_security_group_to_router.go   |   8 +-
 .../add_security_group_to_router_test.go      |   8 +-
 .../add_security_group_to_vpn_gateway.go      |   8 +-
 .../add_security_group_to_vpn_gateway_test.go |   8 +-
 .../cloud/nifcloud/network/http_not_used.go   |   8 +-
 .../nifcloud/network/http_not_used_test.go    |   8 +-
 .../nifcloud/network/no_common_private_elb.go |   8 +-
 .../network/no_common_private_elb_test.go     |   8 +-
 .../network/no_common_private_router.go       |   8 +-
 .../network/no_common_private_router_test.go  |   8 +-
 .../nifcloud/network/use_secure_tls_policy.go |   8 +-
 .../network/use_secure_tls_policy_test.go     |   8 +-
 .../add_description_to_db_security_group.go   |   8 +-
 ...d_description_to_db_security_group_test.go |   8 +-
 .../rdb/no_common_private_db_instance.go      |   8 +-
 .../rdb/no_common_private_db_instance_test.go |   8 +-
 .../cloud/nifcloud/rdb/no_public_db_access.go |   8 +-
 .../nifcloud/rdb/no_public_db_access_test.go  |   8 +-
 .../nifcloud/rdb/no_public_ingress_db_sgr.go  |   8 +-
 .../rdb/no_public_ingress_db_sgr_test.go      |   8 +-
 .../nifcloud/rdb/specify_backup_retention.go  |   8 +-
 .../rdb/specify_backup_retention_test.go      |   8 +-
 .../remove_expired_certificates.go            |   8 +-
 .../remove_expired_certificates_test.go       |   8 +-
 .../compute/no_plaintext_password.go          |   8 +-
 .../compute/no_plaintext_password_test.go     |   8 +-
 .../openstack/compute/no_public_access.go     |   8 +-
 .../compute/no_public_access_test.go          |   8 +-
 .../add_description_to_security_group.go      |   8 +-
 .../add_description_to_security_group_test.go |   8 +-
 .../openstack/networking/no_public_egress.go  |   8 +-
 .../networking/no_public_egress_test.go       |   8 +-
 .../openstack/networking/no_public_ingress.go |   8 +-
 .../networking/no_public_ingress_test.go      |   8 +-
 checks/cloud/oracle/compute/no_public_ip.go   |   8 +-
 .../cloud/oracle/compute/no_public_ip_test.go |   8 +-
 checks/kubernetes/network/no_public_egress.go |   8 +-
 .../network/no_public_egress_test.go          |   8 +-
 .../kubernetes/network/no_public_ingress.go   |   8 +-
 .../network/no_public_ingress_test.go         |   8 +-
 cmd/id/main.go                                |   1 -
 go.mod                                        |  64 ++++----
 go.sum                                        | 147 +++++++++++-------
 pkg/rules/rules.go                            |   2 +-
 651 files changed, 2853 insertions(+), 2821 deletions(-)

diff --git a/checks/cloud/aws/accessanalyzer/enable_access_analyzer.go b/checks/cloud/aws/accessanalyzer/enable_access_analyzer.go
index 3017de56..619fdcfa 100755
--- a/checks/cloud/aws/accessanalyzer/enable_access_analyzer.go
+++ b/checks/cloud/aws/accessanalyzer/enable_access_analyzer.go
@@ -1,13 +1,13 @@
 package accessanalyzer
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var CheckEnableAccessAnalyzer = rules.Register(
diff --git a/checks/cloud/aws/accessanalyzer/enable_access_analyzer_test.go b/checks/cloud/aws/accessanalyzer/enable_access_analyzer_test.go
index ef3833ed..14a8743e 100644
--- a/checks/cloud/aws/accessanalyzer/enable_access_analyzer_test.go
+++ b/checks/cloud/aws/accessanalyzer/enable_access_analyzer_test.go
@@ -3,13 +3,13 @@ package accessanalyzer
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/accessanalyzer"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/accessanalyzer"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/apigateway/enable_access_logging.go b/checks/cloud/aws/apigateway/enable_access_logging.go
index 81577d8a..756a112f 100755
--- a/checks/cloud/aws/apigateway/enable_access_logging.go
+++ b/checks/cloud/aws/apigateway/enable_access_logging.go
@@ -1,11 +1,11 @@
 package apigateway
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAccessLogging = rules.Register(
diff --git a/checks/cloud/aws/apigateway/enable_access_logging_test.go b/checks/cloud/aws/apigateway/enable_access_logging_test.go
index 0fd57ad1..3613f640 100644
--- a/checks/cloud/aws/apigateway/enable_access_logging_test.go
+++ b/checks/cloud/aws/apigateway/enable_access_logging_test.go
@@ -3,13 +3,13 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
+	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/apigateway/enable_cache.go b/checks/cloud/aws/apigateway/enable_cache.go
index 65ae11fb..1ee656d4 100644
--- a/checks/cloud/aws/apigateway/enable_cache.go
+++ b/checks/cloud/aws/apigateway/enable_cache.go
@@ -1,11 +1,11 @@
 package apigateway
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableCache = rules.Register(
diff --git a/checks/cloud/aws/apigateway/enable_cache_encryption.go b/checks/cloud/aws/apigateway/enable_cache_encryption.go
index ac7dd5d8..30a460e1 100755
--- a/checks/cloud/aws/apigateway/enable_cache_encryption.go
+++ b/checks/cloud/aws/apigateway/enable_cache_encryption.go
@@ -1,11 +1,11 @@
 package apigateway
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableCacheEncryption = rules.Register(
diff --git a/checks/cloud/aws/apigateway/enable_cache_encryption_test.go b/checks/cloud/aws/apigateway/enable_cache_encryption_test.go
index 56dbeb62..126e445b 100644
--- a/checks/cloud/aws/apigateway/enable_cache_encryption_test.go
+++ b/checks/cloud/aws/apigateway/enable_cache_encryption_test.go
@@ -3,13 +3,13 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
+	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/apigateway/enable_cache_test.go b/checks/cloud/aws/apigateway/enable_cache_test.go
index e1d69294..d902d861 100644
--- a/checks/cloud/aws/apigateway/enable_cache_test.go
+++ b/checks/cloud/aws/apigateway/enable_cache_test.go
@@ -3,13 +3,13 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
+	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/apigateway/enable_tracing.go b/checks/cloud/aws/apigateway/enable_tracing.go
index d4e6a2e3..5b88b55b 100755
--- a/checks/cloud/aws/apigateway/enable_tracing.go
+++ b/checks/cloud/aws/apigateway/enable_tracing.go
@@ -1,11 +1,11 @@
 package apigateway
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableTracing = rules.Register(
diff --git a/checks/cloud/aws/apigateway/enable_tracing_test.go b/checks/cloud/aws/apigateway/enable_tracing_test.go
index 16ead16a..636bdc74 100644
--- a/checks/cloud/aws/apigateway/enable_tracing_test.go
+++ b/checks/cloud/aws/apigateway/enable_tracing_test.go
@@ -3,13 +3,13 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
+	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/apigateway/no_public_access.go b/checks/cloud/aws/apigateway/no_public_access.go
index e2b4e8b9..79461c2f 100755
--- a/checks/cloud/aws/apigateway/no_public_access.go
+++ b/checks/cloud/aws/apigateway/no_public_access.go
@@ -1,12 +1,12 @@
 package apigateway
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/aws/apigateway/no_public_access_test.go b/checks/cloud/aws/apigateway/no_public_access_test.go
index a43ceead..3949a769 100644
--- a/checks/cloud/aws/apigateway/no_public_access_test.go
+++ b/checks/cloud/aws/apigateway/no_public_access_test.go
@@ -3,13 +3,13 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
+	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/apigateway/use_secure_tls_policy.go b/checks/cloud/aws/apigateway/use_secure_tls_policy.go
index d860dc07..0bc84cad 100755
--- a/checks/cloud/aws/apigateway/use_secure_tls_policy.go
+++ b/checks/cloud/aws/apigateway/use_secure_tls_policy.go
@@ -1,11 +1,11 @@
 package apigateway
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseSecureTlsPolicy = rules.Register(
diff --git a/checks/cloud/aws/apigateway/use_secure_tls_policy_test.go b/checks/cloud/aws/apigateway/use_secure_tls_policy_test.go
index ae6e089c..2b2a7a20 100644
--- a/checks/cloud/aws/apigateway/use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/apigateway/use_secure_tls_policy_test.go
@@ -3,13 +3,13 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
+	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/athena/enable_at_rest_encryption.go b/checks/cloud/aws/athena/enable_at_rest_encryption.go
index 384c6cda..097942cd 100755
--- a/checks/cloud/aws/athena/enable_at_rest_encryption.go
+++ b/checks/cloud/aws/athena/enable_at_rest_encryption.go
@@ -1,12 +1,12 @@
 package athena
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/athena"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/athena"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/aws/athena/enable_at_rest_encryption_test.go b/checks/cloud/aws/athena/enable_at_rest_encryption_test.go
index 143340ed..a9005890 100644
--- a/checks/cloud/aws/athena/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/athena/enable_at_rest_encryption_test.go
@@ -3,12 +3,12 @@ package athena
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/athena"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/athena"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/athena/no_encryption_override.go b/checks/cloud/aws/athena/no_encryption_override.go
index 7de17ad1..ca3fbc57 100755
--- a/checks/cloud/aws/athena/no_encryption_override.go
+++ b/checks/cloud/aws/athena/no_encryption_override.go
@@ -1,11 +1,11 @@
 package athena
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoEncryptionOverride = rules.Register(
diff --git a/checks/cloud/aws/athena/no_encryption_override_test.go b/checks/cloud/aws/athena/no_encryption_override_test.go
index d9f6c375..7c1b19d2 100644
--- a/checks/cloud/aws/athena/no_encryption_override_test.go
+++ b/checks/cloud/aws/athena/no_encryption_override_test.go
@@ -3,12 +3,12 @@ package athena
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/athena"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/athena"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudfront/enable_logging.go b/checks/cloud/aws/cloudfront/enable_logging.go
index 203335f6..1dd7f119 100755
--- a/checks/cloud/aws/cloudfront/enable_logging.go
+++ b/checks/cloud/aws/cloudfront/enable_logging.go
@@ -1,11 +1,11 @@
 package cloudfront
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableLogging = rules.Register(
diff --git a/checks/cloud/aws/cloudfront/enable_logging_test.go b/checks/cloud/aws/cloudfront/enable_logging_test.go
index 12cd81b3..24d7230c 100644
--- a/checks/cloud/aws/cloudfront/enable_logging_test.go
+++ b/checks/cloud/aws/cloudfront/enable_logging_test.go
@@ -3,12 +3,12 @@ package cloudfront
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudfront"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudfront"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudfront/enable_waf.go b/checks/cloud/aws/cloudfront/enable_waf.go
index a4c37289..328c2e1e 100755
--- a/checks/cloud/aws/cloudfront/enable_waf.go
+++ b/checks/cloud/aws/cloudfront/enable_waf.go
@@ -1,11 +1,11 @@
 package cloudfront
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableWaf = rules.Register(
diff --git a/checks/cloud/aws/cloudfront/enable_waf_test.go b/checks/cloud/aws/cloudfront/enable_waf_test.go
index 9e22d272..5498c65c 100644
--- a/checks/cloud/aws/cloudfront/enable_waf_test.go
+++ b/checks/cloud/aws/cloudfront/enable_waf_test.go
@@ -3,12 +3,12 @@ package cloudfront
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudfront"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudfront"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudfront/enforce_https.go b/checks/cloud/aws/cloudfront/enforce_https.go
index 47b4206a..03417443 100755
--- a/checks/cloud/aws/cloudfront/enforce_https.go
+++ b/checks/cloud/aws/cloudfront/enforce_https.go
@@ -1,12 +1,12 @@
 package cloudfront
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudfront"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudfront"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnforceHttps = rules.Register(
diff --git a/checks/cloud/aws/cloudfront/enforce_https_test.go b/checks/cloud/aws/cloudfront/enforce_https_test.go
index ceaf4063..a46ffa20 100644
--- a/checks/cloud/aws/cloudfront/enforce_https_test.go
+++ b/checks/cloud/aws/cloudfront/enforce_https_test.go
@@ -3,12 +3,12 @@ package cloudfront
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudfront"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudfront"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudfront/use_secure_tls_policy.go b/checks/cloud/aws/cloudfront/use_secure_tls_policy.go
index 39d91767..cd600f0d 100755
--- a/checks/cloud/aws/cloudfront/use_secure_tls_policy.go
+++ b/checks/cloud/aws/cloudfront/use_secure_tls_policy.go
@@ -1,12 +1,12 @@
 package cloudfront
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudfront"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudfront"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseSecureTlsPolicy = rules.Register(
diff --git a/checks/cloud/aws/cloudfront/use_secure_tls_policy_test.go b/checks/cloud/aws/cloudfront/use_secure_tls_policy_test.go
index aea6a475..c436b754 100644
--- a/checks/cloud/aws/cloudfront/use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/cloudfront/use_secure_tls_policy_test.go
@@ -3,12 +3,12 @@ package cloudfront
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudfront"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudfront"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudtrail/enable_all_regions.go b/checks/cloud/aws/cloudtrail/enable_all_regions.go
index b9a765d3..f6a7ee76 100755
--- a/checks/cloud/aws/cloudtrail/enable_all_regions.go
+++ b/checks/cloud/aws/cloudtrail/enable_all_regions.go
@@ -1,12 +1,12 @@
 package cloudtrail
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAllRegions = rules.Register(
diff --git a/checks/cloud/aws/cloudtrail/enable_all_regions_test.go b/checks/cloud/aws/cloudtrail/enable_all_regions_test.go
index 94b9dc7e..a096f9cd 100644
--- a/checks/cloud/aws/cloudtrail/enable_all_regions_test.go
+++ b/checks/cloud/aws/cloudtrail/enable_all_regions_test.go
@@ -3,12 +3,12 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudtrail/enable_at_rest_encryption.go b/checks/cloud/aws/cloudtrail/enable_at_rest_encryption.go
index 83fb8fb9..cfcb3313 100755
--- a/checks/cloud/aws/cloudtrail/enable_at_rest_encryption.go
+++ b/checks/cloud/aws/cloudtrail/enable_at_rest_encryption.go
@@ -1,11 +1,11 @@
 package cloudtrail
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/aws/cloudtrail/enable_at_rest_encryption_test.go b/checks/cloud/aws/cloudtrail/enable_at_rest_encryption_test.go
index ed0724e4..99e83494 100644
--- a/checks/cloud/aws/cloudtrail/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/cloudtrail/enable_at_rest_encryption_test.go
@@ -3,12 +3,12 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudtrail/enable_log_validation.go b/checks/cloud/aws/cloudtrail/enable_log_validation.go
index 53150dc0..c8f8a14f 100755
--- a/checks/cloud/aws/cloudtrail/enable_log_validation.go
+++ b/checks/cloud/aws/cloudtrail/enable_log_validation.go
@@ -1,11 +1,11 @@
 package cloudtrail
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableLogValidation = rules.Register(
diff --git a/checks/cloud/aws/cloudtrail/enable_log_validation_test.go b/checks/cloud/aws/cloudtrail/enable_log_validation_test.go
index 83837d69..fdbd2766 100644
--- a/checks/cloud/aws/cloudtrail/enable_log_validation_test.go
+++ b/checks/cloud/aws/cloudtrail/enable_log_validation_test.go
@@ -3,12 +3,12 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration.go b/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration.go
index f45058de..ffdb4d2d 100755
--- a/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration.go
+++ b/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration.go
@@ -1,12 +1,12 @@
 package cloudtrail
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var checkEnsureCloudwatchIntegration = rules.Register(
diff --git a/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration_test.go b/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration_test.go
index 707f24e2..4c63123b 100644
--- a/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration_test.go
+++ b/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration_test.go
@@ -3,12 +3,12 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudtrail/no_public_log_access.go b/checks/cloud/aws/cloudtrail/no_public_log_access.go
index 2aa5541a..78cff1a0 100755
--- a/checks/cloud/aws/cloudtrail/no_public_log_access.go
+++ b/checks/cloud/aws/cloudtrail/no_public_log_access.go
@@ -1,12 +1,12 @@
 package cloudtrail
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var checkNoPublicLogAccess = rules.Register(
diff --git a/checks/cloud/aws/cloudtrail/no_public_log_access_test.go b/checks/cloud/aws/cloudtrail/no_public_log_access_test.go
index 6f8db5f8..a4c681be 100644
--- a/checks/cloud/aws/cloudtrail/no_public_log_access_test.go
+++ b/checks/cloud/aws/cloudtrail/no_public_log_access_test.go
@@ -3,13 +3,13 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudtrail/require_bucket_access_logging.go b/checks/cloud/aws/cloudtrail/require_bucket_access_logging.go
index e297847e..ea588a3e 100755
--- a/checks/cloud/aws/cloudtrail/require_bucket_access_logging.go
+++ b/checks/cloud/aws/cloudtrail/require_bucket_access_logging.go
@@ -1,12 +1,12 @@
 package cloudtrail
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var checkBucketAccessLoggingRequired = rules.Register(
diff --git a/checks/cloud/aws/cloudtrail/require_bucket_access_logging_test.go b/checks/cloud/aws/cloudtrail/require_bucket_access_logging_test.go
index 2c1074e2..d036129a 100644
--- a/checks/cloud/aws/cloudtrail/require_bucket_access_logging_test.go
+++ b/checks/cloud/aws/cloudtrail/require_bucket_access_logging_test.go
@@ -3,13 +3,13 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudwatch/log_group_customer_key.go b/checks/cloud/aws/cloudwatch/log_group_customer_key.go
index f2792ac6..8e21008b 100755
--- a/checks/cloud/aws/cloudwatch/log_group_customer_key.go
+++ b/checks/cloud/aws/cloudwatch/log_group_customer_key.go
@@ -1,11 +1,11 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckLogGroupCustomerKey = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/log_group_customer_key_test.go b/checks/cloud/aws/cloudwatch/log_group_customer_key_test.go
index 1e5a42db..6462739f 100644
--- a/checks/cloud/aws/cloudwatch/log_group_customer_key_test.go
+++ b/checks/cloud/aws/cloudwatch/log_group_customer_key_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm.go b/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm.go
index 9294ec52..2f8771e5 100644
--- a/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireCloudTrailChangeAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm_test.go
index 9cfd5759..c51be507 100644
--- a/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm.go b/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm.go
index 14efb1ee..10a1a9dd 100644
--- a/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireCMKDisabledAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm_test.go b/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm_test.go
index fc563a70..aab123b9 100644
--- a/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm.go b/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm.go
index 12abc8c9..6f12cc88 100644
--- a/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireConfigConfigurationChangeAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm_test.go
index 83e7fc59..3bf15ed1 100644
--- a/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm.go b/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm.go
index 8005c103..736f1d6f 100644
--- a/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireConsoleLoginFailureAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm_test.go b/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm_test.go
index 1a44c376..d61aa8ec 100644
--- a/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm.go b/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm.go
index 0006018c..1e7df8a6 100644
--- a/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireIAMPolicyChangeAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm_test.go
index 8b201509..67409e21 100644
--- a/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_nacl_change_alarm.go b/checks/cloud/aws/cloudwatch/require_nacl_change_alarm.go
index 1d686160..ab7fe140 100644
--- a/checks/cloud/aws/cloudwatch/require_nacl_change_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_nacl_change_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireNACLChangeAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_nacl_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_nacl_change_alarm_test.go
index 34fb7db1..443f4997 100644
--- a/checks/cloud/aws/cloudwatch/require_nacl_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_nacl_change_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm.go b/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm.go
index c24ddbb6..722f1c50 100644
--- a/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireNetworkGatewayChangeAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm_test.go
index e4c2575c..bf2c4880 100644
--- a/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm.go b/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm.go
index 46ba4433..2a6d6bf9 100644
--- a/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireNonMFALoginAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm_test.go b/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm_test.go
index 626ed53c..de1ff8a1 100644
--- a/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_org_changes_alarm.go b/checks/cloud/aws/cloudwatch/require_org_changes_alarm.go
index 7fab4463..47ecb929 100644
--- a/checks/cloud/aws/cloudwatch/require_org_changes_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_org_changes_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var CheckRequireOrgChangesAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_org_changes_alarm_test.go b/checks/cloud/aws/cloudwatch/require_org_changes_alarm_test.go
index 369f14a3..098e0bd6 100644
--- a/checks/cloud/aws/cloudwatch/require_org_changes_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_org_changes_alarm_test.go
@@ -3,13 +3,13 @@ package cloudwatch
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm.go b/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm.go
index 1f35861c..067a9d56 100644
--- a/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireRootUserUsageAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm_test.go b/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm_test.go
index 2df27bec..5349798c 100644
--- a/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_route_table_change_alarm.go b/checks/cloud/aws/cloudwatch/require_route_table_change_alarm.go
index e8e3dd84..f5a77ea8 100644
--- a/checks/cloud/aws/cloudwatch/require_route_table_change_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_route_table_change_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireRouteTableChangeAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_route_table_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_route_table_change_alarm_test.go
index 5eec4219..82f02e39 100644
--- a/checks/cloud/aws/cloudwatch/require_route_table_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_route_table_change_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm.go b/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm.go
index fcfef831..1ffe2619 100644
--- a/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireS3BucketPolicyChangeAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm_test.go
index 9c55ea70..d6b9c64d 100644
--- a/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_security_group_change_alarm.go b/checks/cloud/aws/cloudwatch/require_security_group_change_alarm.go
index 98801858..bec16a92 100644
--- a/checks/cloud/aws/cloudwatch/require_security_group_change_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_security_group_change_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireSecurityGroupChangeAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_security_group_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_security_group_change_alarm_test.go
index f269719e..2b2213a9 100644
--- a/checks/cloud/aws/cloudwatch/require_security_group_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_security_group_change_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm.go b/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm.go
index de40a167..12606740 100644
--- a/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireUnauthorizedApiCallAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm_test.go b/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm_test.go
index 0e1b66f1..f4b50dd6 100644
--- a/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/cloudwatch/require_vpc_change_alarm.go b/checks/cloud/aws/cloudwatch/require_vpc_change_alarm.go
index 66503820..80e3c8e3 100644
--- a/checks/cloud/aws/cloudwatch/require_vpc_change_alarm.go
+++ b/checks/cloud/aws/cloudwatch/require_vpc_change_alarm.go
@@ -1,14 +1,14 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var requireVPCChangeAlarm = rules.Register(
diff --git a/checks/cloud/aws/cloudwatch/require_vpc_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_vpc_change_alarm_test.go
index c7045e87..2b3220e4 100644
--- a/checks/cloud/aws/cloudwatch/require_vpc_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_vpc_change_alarm_test.go
@@ -3,12 +3,12 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/codebuild/enable_encryption.go b/checks/cloud/aws/codebuild/enable_encryption.go
index b70fff48..6043c740 100755
--- a/checks/cloud/aws/codebuild/enable_encryption.go
+++ b/checks/cloud/aws/codebuild/enable_encryption.go
@@ -1,11 +1,11 @@
 package codebuild
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableEncryption = rules.Register(
diff --git a/checks/cloud/aws/codebuild/enable_encryption_test.go b/checks/cloud/aws/codebuild/enable_encryption_test.go
index 924b494b..b7edb258 100644
--- a/checks/cloud/aws/codebuild/enable_encryption_test.go
+++ b/checks/cloud/aws/codebuild/enable_encryption_test.go
@@ -3,12 +3,12 @@ package codebuild
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/codebuild"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/codebuild"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/config/aggregate_all_regions.go b/checks/cloud/aws/config/aggregate_all_regions.go
index 117389a0..1d5e70c8 100755
--- a/checks/cloud/aws/config/aggregate_all_regions.go
+++ b/checks/cloud/aws/config/aggregate_all_regions.go
@@ -1,11 +1,11 @@
 package config
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAggregateAllRegions = rules.Register(
diff --git a/checks/cloud/aws/config/aggregate_all_regions_test.go b/checks/cloud/aws/config/aggregate_all_regions_test.go
index 8835a098..7cbc1d01 100644
--- a/checks/cloud/aws/config/aggregate_all_regions_test.go
+++ b/checks/cloud/aws/config/aggregate_all_regions_test.go
@@ -3,12 +3,12 @@ package config
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/config"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/config"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/documentdb/enable_log_export.go b/checks/cloud/aws/documentdb/enable_log_export.go
index f441031a..58584fa4 100755
--- a/checks/cloud/aws/documentdb/enable_log_export.go
+++ b/checks/cloud/aws/documentdb/enable_log_export.go
@@ -1,12 +1,12 @@
 package documentdb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/documentdb"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/documentdb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableLogExport = rules.Register(
diff --git a/checks/cloud/aws/documentdb/enable_log_export_test.go b/checks/cloud/aws/documentdb/enable_log_export_test.go
index 5b5b343f..effb2a9a 100644
--- a/checks/cloud/aws/documentdb/enable_log_export_test.go
+++ b/checks/cloud/aws/documentdb/enable_log_export_test.go
@@ -3,12 +3,12 @@ package documentdb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/documentdb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/documentdb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/documentdb/enable_storage_encryption.go b/checks/cloud/aws/documentdb/enable_storage_encryption.go
index 084ab76d..bc0fb162 100755
--- a/checks/cloud/aws/documentdb/enable_storage_encryption.go
+++ b/checks/cloud/aws/documentdb/enable_storage_encryption.go
@@ -1,11 +1,11 @@
 package documentdb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableStorageEncryption = rules.Register(
diff --git a/checks/cloud/aws/documentdb/enable_storage_encryption_test.go b/checks/cloud/aws/documentdb/enable_storage_encryption_test.go
index 1fb810c0..00cead1e 100644
--- a/checks/cloud/aws/documentdb/enable_storage_encryption_test.go
+++ b/checks/cloud/aws/documentdb/enable_storage_encryption_test.go
@@ -3,12 +3,12 @@ package documentdb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/documentdb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/documentdb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/documentdb/encryption_customer_key.go b/checks/cloud/aws/documentdb/encryption_customer_key.go
index 1c58fd67..5e80ed47 100755
--- a/checks/cloud/aws/documentdb/encryption_customer_key.go
+++ b/checks/cloud/aws/documentdb/encryption_customer_key.go
@@ -1,11 +1,11 @@
 package documentdb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEncryptionCustomerKey = rules.Register(
diff --git a/checks/cloud/aws/documentdb/encryption_customer_key_test.go b/checks/cloud/aws/documentdb/encryption_customer_key_test.go
index 7ba3123f..6987b42a 100644
--- a/checks/cloud/aws/documentdb/encryption_customer_key_test.go
+++ b/checks/cloud/aws/documentdb/encryption_customer_key_test.go
@@ -3,12 +3,12 @@ package documentdb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/documentdb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/documentdb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/dynamodb/enable_at_rest_encryption.go b/checks/cloud/aws/dynamodb/enable_at_rest_encryption.go
index 34d45b52..95b0d73d 100755
--- a/checks/cloud/aws/dynamodb/enable_at_rest_encryption.go
+++ b/checks/cloud/aws/dynamodb/enable_at_rest_encryption.go
@@ -1,11 +1,11 @@
 package dynamodb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/aws/dynamodb/enable_at_rest_encryption_test.go b/checks/cloud/aws/dynamodb/enable_at_rest_encryption_test.go
index b2cf54ea..e742b86c 100644
--- a/checks/cloud/aws/dynamodb/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/dynamodb/enable_at_rest_encryption_test.go
@@ -3,12 +3,12 @@ package dynamodb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/dynamodb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/dynamodb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/dynamodb/enable_recovery.go b/checks/cloud/aws/dynamodb/enable_recovery.go
index a46a4417..c4b1254c 100755
--- a/checks/cloud/aws/dynamodb/enable_recovery.go
+++ b/checks/cloud/aws/dynamodb/enable_recovery.go
@@ -1,11 +1,11 @@
 package dynamodb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableRecovery = rules.Register(
diff --git a/checks/cloud/aws/dynamodb/enable_recovery_test.go b/checks/cloud/aws/dynamodb/enable_recovery_test.go
index 61426148..bd16ddff 100644
--- a/checks/cloud/aws/dynamodb/enable_recovery_test.go
+++ b/checks/cloud/aws/dynamodb/enable_recovery_test.go
@@ -3,12 +3,12 @@ package dynamodb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/dynamodb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/dynamodb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/dynamodb/table_customer_key.go b/checks/cloud/aws/dynamodb/table_customer_key.go
index e72309ea..c7ab7999 100755
--- a/checks/cloud/aws/dynamodb/table_customer_key.go
+++ b/checks/cloud/aws/dynamodb/table_customer_key.go
@@ -1,12 +1,12 @@
 package dynamodb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/dynamodb"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/dynamodb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckTableCustomerKey = rules.Register(
diff --git a/checks/cloud/aws/dynamodb/table_customer_key_test.go b/checks/cloud/aws/dynamodb/table_customer_key_test.go
index 6baa322f..b14775d0 100644
--- a/checks/cloud/aws/dynamodb/table_customer_key_test.go
+++ b/checks/cloud/aws/dynamodb/table_customer_key_test.go
@@ -3,10 +3,10 @@ package dynamodb
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/dynamodb"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/dynamodb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/ec2/add_description_to_security_group.go b/checks/cloud/aws/ec2/add_description_to_security_group.go
index 3865d873..89419436 100755
--- a/checks/cloud/aws/ec2/add_description_to_security_group.go
+++ b/checks/cloud/aws/ec2/add_description_to_security_group.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddDescriptionToSecurityGroup = rules.Register(
diff --git a/checks/cloud/aws/ec2/add_description_to_security_group_rule.go b/checks/cloud/aws/ec2/add_description_to_security_group_rule.go
index 9e67404c..0b58f9c8 100755
--- a/checks/cloud/aws/ec2/add_description_to_security_group_rule.go
+++ b/checks/cloud/aws/ec2/add_description_to_security_group_rule.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddDescriptionToSecurityGroupRule = rules.Register(
diff --git a/checks/cloud/aws/ec2/add_description_to_security_group_rule_test.go b/checks/cloud/aws/ec2/add_description_to_security_group_rule_test.go
index 6e19ce59..d104b3f4 100644
--- a/checks/cloud/aws/ec2/add_description_to_security_group_rule_test.go
+++ b/checks/cloud/aws/ec2/add_description_to_security_group_rule_test.go
@@ -3,13 +3,13 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/add_description_to_security_group_test.go b/checks/cloud/aws/ec2/add_description_to_security_group_test.go
index 448f6195..a607d65f 100644
--- a/checks/cloud/aws/ec2/add_description_to_security_group_test.go
+++ b/checks/cloud/aws/ec2/add_description_to_security_group_test.go
@@ -3,13 +3,13 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/as_enable_at_rest_encryption.go b/checks/cloud/aws/ec2/as_enable_at_rest_encryption.go
index f2a87aad..441c214c 100755
--- a/checks/cloud/aws/ec2/as_enable_at_rest_encryption.go
+++ b/checks/cloud/aws/ec2/as_enable_at_rest_encryption.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckASEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/aws/ec2/as_enable_at_rest_encryption_test.go b/checks/cloud/aws/ec2/as_enable_at_rest_encryption_test.go
index 1393e7f1..cbfc3a5d 100644
--- a/checks/cloud/aws/ec2/as_enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/ec2/as_enable_at_rest_encryption_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/as_enforce_http_token_imds.go b/checks/cloud/aws/ec2/as_enforce_http_token_imds.go
index 3a8ad611..85732e2e 100755
--- a/checks/cloud/aws/ec2/as_enforce_http_token_imds.go
+++ b/checks/cloud/aws/ec2/as_enforce_http_token_imds.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckASIMDSAccessRequiresToken = rules.Register(
diff --git a/checks/cloud/aws/ec2/as_enforce_http_token_imds_test.go b/checks/cloud/aws/ec2/as_enforce_http_token_imds_test.go
index 2b1cc016..855ffec8 100644
--- a/checks/cloud/aws/ec2/as_enforce_http_token_imds_test.go
+++ b/checks/cloud/aws/ec2/as_enforce_http_token_imds_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/as_no_secrets_in_user_data.go b/checks/cloud/aws/ec2/as_no_secrets_in_user_data.go
index e8f1fb47..236bd87c 100755
--- a/checks/cloud/aws/ec2/as_no_secrets_in_user_data.go
+++ b/checks/cloud/aws/ec2/as_no_secrets_in_user_data.go
@@ -3,15 +3,15 @@ package ec2
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 
 	"github.com/owenrumney/squealer/pkg/squealer"
 )
diff --git a/checks/cloud/aws/ec2/as_no_secrets_in_user_data_test.go b/checks/cloud/aws/ec2/as_no_secrets_in_user_data_test.go
index ec20f581..ba5365fe 100644
--- a/checks/cloud/aws/ec2/as_no_secrets_in_user_data_test.go
+++ b/checks/cloud/aws/ec2/as_no_secrets_in_user_data_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/enable_at_rest_encryption.go b/checks/cloud/aws/ec2/enable_at_rest_encryption.go
index 2ff8c6f4..bb185eed 100755
--- a/checks/cloud/aws/ec2/enable_at_rest_encryption.go
+++ b/checks/cloud/aws/ec2/enable_at_rest_encryption.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/aws/ec2/enable_at_rest_encryption_test.go b/checks/cloud/aws/ec2/enable_at_rest_encryption_test.go
index a8563ba6..6f81f043 100644
--- a/checks/cloud/aws/ec2/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/ec2/enable_at_rest_encryption_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/enable_volume_encryption.go b/checks/cloud/aws/ec2/enable_volume_encryption.go
index 7b76d789..a8e1519e 100755
--- a/checks/cloud/aws/ec2/enable_volume_encryption.go
+++ b/checks/cloud/aws/ec2/enable_volume_encryption.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableVolumeEncryption = rules.Register(
diff --git a/checks/cloud/aws/ec2/enable_volume_encryption_test.go b/checks/cloud/aws/ec2/enable_volume_encryption_test.go
index 16274024..e0e0bfd9 100644
--- a/checks/cloud/aws/ec2/enable_volume_encryption_test.go
+++ b/checks/cloud/aws/ec2/enable_volume_encryption_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/encryption_customer_key.go b/checks/cloud/aws/ec2/encryption_customer_key.go
index c1d2f4a4..2b82b9c6 100755
--- a/checks/cloud/aws/ec2/encryption_customer_key.go
+++ b/checks/cloud/aws/ec2/encryption_customer_key.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEncryptionCustomerKey = rules.Register(
diff --git a/checks/cloud/aws/ec2/encryption_customer_key_test.go b/checks/cloud/aws/ec2/encryption_customer_key_test.go
index a6fc6f94..f38c169a 100644
--- a/checks/cloud/aws/ec2/encryption_customer_key_test.go
+++ b/checks/cloud/aws/ec2/encryption_customer_key_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/enforce_http_token_imds.go b/checks/cloud/aws/ec2/enforce_http_token_imds.go
index 78ac3448..40b5ab0f 100755
--- a/checks/cloud/aws/ec2/enforce_http_token_imds.go
+++ b/checks/cloud/aws/ec2/enforce_http_token_imds.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckIMDSAccessRequiresToken = rules.Register(
diff --git a/checks/cloud/aws/ec2/enforce_http_token_imds_test.go b/checks/cloud/aws/ec2/enforce_http_token_imds_test.go
index 5abbfc22..f8e6207f 100644
--- a/checks/cloud/aws/ec2/enforce_http_token_imds_test.go
+++ b/checks/cloud/aws/ec2/enforce_http_token_imds_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/no_default_vpc.go b/checks/cloud/aws/ec2/no_default_vpc.go
index da3bfb67..67dcc0b2 100755
--- a/checks/cloud/aws/ec2/no_default_vpc.go
+++ b/checks/cloud/aws/ec2/no_default_vpc.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoDefaultVpc = rules.Register(
diff --git a/checks/cloud/aws/ec2/no_default_vpc_test.go b/checks/cloud/aws/ec2/no_default_vpc_test.go
index 2ccec8b0..ff95b4d7 100644
--- a/checks/cloud/aws/ec2/no_default_vpc_test.go
+++ b/checks/cloud/aws/ec2/no_default_vpc_test.go
@@ -3,13 +3,13 @@ package ec2
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/no_excessive_port_access.go b/checks/cloud/aws/ec2/no_excessive_port_access.go
index d19cb004..4b24fa02 100755
--- a/checks/cloud/aws/ec2/no_excessive_port_access.go
+++ b/checks/cloud/aws/ec2/no_excessive_port_access.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoExcessivePortAccess = rules.Register(
diff --git a/checks/cloud/aws/ec2/no_excessive_port_access_test.go b/checks/cloud/aws/ec2/no_excessive_port_access_test.go
index 3a276fb9..fd96f9ce 100644
--- a/checks/cloud/aws/ec2/no_excessive_port_access_test.go
+++ b/checks/cloud/aws/ec2/no_excessive_port_access_test.go
@@ -3,13 +3,13 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/no_public_egress_sgr.go b/checks/cloud/aws/ec2/no_public_egress_sgr.go
index 0d66a15d..1fcd4d19 100755
--- a/checks/cloud/aws/ec2/no_public_egress_sgr.go
+++ b/checks/cloud/aws/ec2/no_public_egress_sgr.go
@@ -1,12 +1,12 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicEgressSgr = rules.Register(
diff --git a/checks/cloud/aws/ec2/no_public_egress_sgr_test.go b/checks/cloud/aws/ec2/no_public_egress_sgr_test.go
index 57cf37cc..ade019d1 100644
--- a/checks/cloud/aws/ec2/no_public_egress_sgr_test.go
+++ b/checks/cloud/aws/ec2/no_public_egress_sgr_test.go
@@ -3,13 +3,13 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/no_public_ingress_acl.go b/checks/cloud/aws/ec2/no_public_ingress_acl.go
index f7ad0d71..407a883e 100755
--- a/checks/cloud/aws/ec2/no_public_ingress_acl.go
+++ b/checks/cloud/aws/ec2/no_public_ingress_acl.go
@@ -1,13 +1,13 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngress = rules.Register(
diff --git a/checks/cloud/aws/ec2/no_public_ingress_acl_test.go b/checks/cloud/aws/ec2/no_public_ingress_acl_test.go
index 19939ee7..b61a25a9 100644
--- a/checks/cloud/aws/ec2/no_public_ingress_acl_test.go
+++ b/checks/cloud/aws/ec2/no_public_ingress_acl_test.go
@@ -3,13 +3,13 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/no_public_ingress_sgr.go b/checks/cloud/aws/ec2/no_public_ingress_sgr.go
index 3e540584..158a2d0f 100755
--- a/checks/cloud/aws/ec2/no_public_ingress_sgr.go
+++ b/checks/cloud/aws/ec2/no_public_ingress_sgr.go
@@ -1,13 +1,13 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngressSgr = rules.Register(
diff --git a/checks/cloud/aws/ec2/no_public_ingress_sgr_test.go b/checks/cloud/aws/ec2/no_public_ingress_sgr_test.go
index 00d46fc7..6d67f9ce 100644
--- a/checks/cloud/aws/ec2/no_public_ingress_sgr_test.go
+++ b/checks/cloud/aws/ec2/no_public_ingress_sgr_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/no_public_ip.go b/checks/cloud/aws/ec2/no_public_ip.go
index c2358ca9..1f448437 100755
--- a/checks/cloud/aws/ec2/no_public_ip.go
+++ b/checks/cloud/aws/ec2/no_public_ip.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIp = rules.Register(
diff --git a/checks/cloud/aws/ec2/no_public_ip_subnet.go b/checks/cloud/aws/ec2/no_public_ip_subnet.go
index c87e346f..7090ef80 100755
--- a/checks/cloud/aws/ec2/no_public_ip_subnet.go
+++ b/checks/cloud/aws/ec2/no_public_ip_subnet.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIpSubnet = rules.Register(
diff --git a/checks/cloud/aws/ec2/no_public_ip_subnet_test.go b/checks/cloud/aws/ec2/no_public_ip_subnet_test.go
index 35f5c872..6d4fb425 100644
--- a/checks/cloud/aws/ec2/no_public_ip_subnet_test.go
+++ b/checks/cloud/aws/ec2/no_public_ip_subnet_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/no_public_ip_test.go b/checks/cloud/aws/ec2/no_public_ip_test.go
index 4d5e3fee..88335417 100644
--- a/checks/cloud/aws/ec2/no_public_ip_test.go
+++ b/checks/cloud/aws/ec2/no_public_ip_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/no_secrets_in_user_data.go b/checks/cloud/aws/ec2/no_secrets_in_user_data.go
index 65de5861..1384a954 100755
--- a/checks/cloud/aws/ec2/no_secrets_in_user_data.go
+++ b/checks/cloud/aws/ec2/no_secrets_in_user_data.go
@@ -3,15 +3,15 @@ package ec2
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckNoSecretsInUserData = rules.Register(
diff --git a/checks/cloud/aws/ec2/no_secrets_in_user_data_test.go b/checks/cloud/aws/ec2/no_secrets_in_user_data_test.go
index 2b019165..aeca2882 100644
--- a/checks/cloud/aws/ec2/no_secrets_in_user_data_test.go
+++ b/checks/cloud/aws/ec2/no_secrets_in_user_data_test.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/no_sensitive_info.go b/checks/cloud/aws/ec2/no_sensitive_info.go
index 77e3a395..ccd737a1 100755
--- a/checks/cloud/aws/ec2/no_sensitive_info.go
+++ b/checks/cloud/aws/ec2/no_sensitive_info.go
@@ -3,15 +3,15 @@ package ec2
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 
 	"github.com/owenrumney/squealer/pkg/squealer"
 )
diff --git a/checks/cloud/aws/ec2/no_sensitive_info_test.go b/checks/cloud/aws/ec2/no_sensitive_info_test.go
index 0b2f6710..b1b0e4cc 100644
--- a/checks/cloud/aws/ec2/no_sensitive_info_test.go
+++ b/checks/cloud/aws/ec2/no_sensitive_info_test.go
@@ -3,13 +3,13 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs.go b/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs.go
index 64918a08..28a4f506 100755
--- a/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs.go
+++ b/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs.go
@@ -1,11 +1,11 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRequireVPCFlowLogs = rules.Register(
diff --git a/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs_test.go b/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs_test.go
index 26b5d9b5..c22d4d04 100644
--- a/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs_test.go
+++ b/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs_test.go
@@ -3,13 +3,13 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ec2/restrict_all_in_default_sg.go b/checks/cloud/aws/ec2/restrict_all_in_default_sg.go
index 145a9580..d6f82a22 100755
--- a/checks/cloud/aws/ec2/restrict_all_in_default_sg.go
+++ b/checks/cloud/aws/ec2/restrict_all_in_default_sg.go
@@ -1,12 +1,12 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRestrictAllInDefaultSG = rules.Register(
diff --git a/checks/cloud/aws/ec2/restrict_all_in_default_sg_test.go b/checks/cloud/aws/ec2/restrict_all_in_default_sg_test.go
index 021624e1..745acaaa 100644
--- a/checks/cloud/aws/ec2/restrict_all_in_default_sg_test.go
+++ b/checks/cloud/aws/ec2/restrict_all_in_default_sg_test.go
@@ -3,13 +3,13 @@ package ec2
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ecr/enable_image_scans.go b/checks/cloud/aws/ecr/enable_image_scans.go
index c00240f1..696905ba 100755
--- a/checks/cloud/aws/ecr/enable_image_scans.go
+++ b/checks/cloud/aws/ecr/enable_image_scans.go
@@ -1,11 +1,11 @@
 package ecr
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableImageScans = rules.Register(
diff --git a/checks/cloud/aws/ecr/enable_image_scans_test.go b/checks/cloud/aws/ecr/enable_image_scans_test.go
index 6856099c..1abe5298 100644
--- a/checks/cloud/aws/ecr/enable_image_scans_test.go
+++ b/checks/cloud/aws/ecr/enable_image_scans_test.go
@@ -3,12 +3,12 @@ package ecr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ecr"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ecr/enforce_immutable_repository.go b/checks/cloud/aws/ecr/enforce_immutable_repository.go
index fdd378c8..3b38a761 100755
--- a/checks/cloud/aws/ecr/enforce_immutable_repository.go
+++ b/checks/cloud/aws/ecr/enforce_immutable_repository.go
@@ -1,11 +1,11 @@
 package ecr
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnforceImmutableRepository = rules.Register(
diff --git a/checks/cloud/aws/ecr/enforce_immutable_repository_test.go b/checks/cloud/aws/ecr/enforce_immutable_repository_test.go
index f316b663..51a3bf3d 100644
--- a/checks/cloud/aws/ecr/enforce_immutable_repository_test.go
+++ b/checks/cloud/aws/ecr/enforce_immutable_repository_test.go
@@ -3,12 +3,12 @@ package ecr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ecr"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ecr/no_public_access.go b/checks/cloud/aws/ecr/no_public_access.go
index 3a6ef8fa..057c832f 100755
--- a/checks/cloud/aws/ecr/no_public_access.go
+++ b/checks/cloud/aws/ecr/no_public_access.go
@@ -3,15 +3,15 @@ package ecr
 import (
 	"strings"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/aws/ecr/no_public_access_test.go b/checks/cloud/aws/ecr/no_public_access_test.go
index 226c94b9..f114083e 100644
--- a/checks/cloud/aws/ecr/no_public_access_test.go
+++ b/checks/cloud/aws/ecr/no_public_access_test.go
@@ -3,13 +3,13 @@ package ecr
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ecr"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/liamg/iamgo"
 
diff --git a/checks/cloud/aws/ecr/repository_customer_key.go b/checks/cloud/aws/ecr/repository_customer_key.go
index a6203dbd..5c920a19 100755
--- a/checks/cloud/aws/ecr/repository_customer_key.go
+++ b/checks/cloud/aws/ecr/repository_customer_key.go
@@ -1,12 +1,12 @@
 package ecr
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ecr"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRepositoryCustomerKey = rules.Register(
diff --git a/checks/cloud/aws/ecr/repository_customer_key_test.go b/checks/cloud/aws/ecr/repository_customer_key_test.go
index 51a3e74d..816cdbd1 100644
--- a/checks/cloud/aws/ecr/repository_customer_key_test.go
+++ b/checks/cloud/aws/ecr/repository_customer_key_test.go
@@ -3,12 +3,12 @@ package ecr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ecr"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ecs/enable_container_insight.go b/checks/cloud/aws/ecs/enable_container_insight.go
index d36000f5..af012fc3 100755
--- a/checks/cloud/aws/ecs/enable_container_insight.go
+++ b/checks/cloud/aws/ecs/enable_container_insight.go
@@ -1,11 +1,11 @@
 package ecs
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableContainerInsight = rules.Register(
diff --git a/checks/cloud/aws/ecs/enable_container_insight_test.go b/checks/cloud/aws/ecs/enable_container_insight_test.go
index 7a3d6fa0..1ee6f9e9 100644
--- a/checks/cloud/aws/ecs/enable_container_insight_test.go
+++ b/checks/cloud/aws/ecs/enable_container_insight_test.go
@@ -3,12 +3,12 @@ package ecs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ecs"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecs"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ecs/enable_in_transit_encryption.go b/checks/cloud/aws/ecs/enable_in_transit_encryption.go
index 1e9f79a2..f9a8676c 100755
--- a/checks/cloud/aws/ecs/enable_in_transit_encryption.go
+++ b/checks/cloud/aws/ecs/enable_in_transit_encryption.go
@@ -1,11 +1,11 @@
 package ecs
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableInTransitEncryption = rules.Register(
diff --git a/checks/cloud/aws/ecs/enable_in_transit_encryption_test.go b/checks/cloud/aws/ecs/enable_in_transit_encryption_test.go
index f02a4822..b691c884 100644
--- a/checks/cloud/aws/ecs/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/ecs/enable_in_transit_encryption_test.go
@@ -3,12 +3,12 @@ package ecs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ecs"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecs"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ecs/no_plaintext_secrets.go b/checks/cloud/aws/ecs/no_plaintext_secrets.go
index 6891170b..c0a014af 100755
--- a/checks/cloud/aws/ecs/no_plaintext_secrets.go
+++ b/checks/cloud/aws/ecs/no_plaintext_secrets.go
@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 
 	"github.com/owenrumney/squealer/pkg/squealer"
 )
diff --git a/checks/cloud/aws/ecs/no_plaintext_secrets_test.go b/checks/cloud/aws/ecs/no_plaintext_secrets_test.go
index 99b37281..0da424c6 100644
--- a/checks/cloud/aws/ecs/no_plaintext_secrets_test.go
+++ b/checks/cloud/aws/ecs/no_plaintext_secrets_test.go
@@ -3,12 +3,12 @@ package ecs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ecs"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecs"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/efs/enable_at_rest_encryption.go b/checks/cloud/aws/efs/enable_at_rest_encryption.go
index 12a7a038..13a4a9c0 100755
--- a/checks/cloud/aws/efs/enable_at_rest_encryption.go
+++ b/checks/cloud/aws/efs/enable_at_rest_encryption.go
@@ -1,11 +1,11 @@
 package efs
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/aws/efs/enable_at_rest_encryption_test.go b/checks/cloud/aws/efs/enable_at_rest_encryption_test.go
index 06f991dd..ce3d3348 100644
--- a/checks/cloud/aws/efs/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/efs/enable_at_rest_encryption_test.go
@@ -3,12 +3,12 @@ package efs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/efs"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/efs"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/eks/enable_control_plane_logging.go b/checks/cloud/aws/eks/enable_control_plane_logging.go
index cc880910..45d782e4 100755
--- a/checks/cloud/aws/eks/enable_control_plane_logging.go
+++ b/checks/cloud/aws/eks/enable_control_plane_logging.go
@@ -1,11 +1,11 @@
 package eks
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableControlPlaneLogging = rules.Register(
diff --git a/checks/cloud/aws/eks/enable_control_plane_logging_test.go b/checks/cloud/aws/eks/enable_control_plane_logging_test.go
index b7e27189..2596b5a3 100644
--- a/checks/cloud/aws/eks/enable_control_plane_logging_test.go
+++ b/checks/cloud/aws/eks/enable_control_plane_logging_test.go
@@ -3,12 +3,12 @@ package eks
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/eks"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/eks"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/eks/encrypt_secrets.go b/checks/cloud/aws/eks/encrypt_secrets.go
index f71ac00a..d241143a 100755
--- a/checks/cloud/aws/eks/encrypt_secrets.go
+++ b/checks/cloud/aws/eks/encrypt_secrets.go
@@ -1,11 +1,11 @@
 package eks
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEncryptSecrets = rules.Register(
diff --git a/checks/cloud/aws/eks/encrypt_secrets_test.go b/checks/cloud/aws/eks/encrypt_secrets_test.go
index 31004d6c..ffa0c4e5 100644
--- a/checks/cloud/aws/eks/encrypt_secrets_test.go
+++ b/checks/cloud/aws/eks/encrypt_secrets_test.go
@@ -3,12 +3,12 @@ package eks
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/eks"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/eks"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/eks/no_public_cluster_access.go b/checks/cloud/aws/eks/no_public_cluster_access.go
index f80cc72f..da192f19 100755
--- a/checks/cloud/aws/eks/no_public_cluster_access.go
+++ b/checks/cloud/aws/eks/no_public_cluster_access.go
@@ -1,11 +1,11 @@
 package eks
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicClusterAccess = rules.Register(
diff --git a/checks/cloud/aws/eks/no_public_cluster_access_test.go b/checks/cloud/aws/eks/no_public_cluster_access_test.go
index 4eea8de2..7d20ebf5 100644
--- a/checks/cloud/aws/eks/no_public_cluster_access_test.go
+++ b/checks/cloud/aws/eks/no_public_cluster_access_test.go
@@ -3,12 +3,12 @@ package eks
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/eks"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/eks"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/eks/no_public_cluster_access_to_cidr.go b/checks/cloud/aws/eks/no_public_cluster_access_to_cidr.go
index 8cbbaada..b81dcd0b 100755
--- a/checks/cloud/aws/eks/no_public_cluster_access_to_cidr.go
+++ b/checks/cloud/aws/eks/no_public_cluster_access_to_cidr.go
@@ -3,17 +3,17 @@ package eks
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckNoPublicClusterAccessToCidr = rules.Register(
diff --git a/checks/cloud/aws/eks/no_public_cluster_access_to_cidr_test.go b/checks/cloud/aws/eks/no_public_cluster_access_to_cidr_test.go
index 7fe0244f..681e4c91 100644
--- a/checks/cloud/aws/eks/no_public_cluster_access_to_cidr_test.go
+++ b/checks/cloud/aws/eks/no_public_cluster_access_to_cidr_test.go
@@ -3,12 +3,12 @@ package eks
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/eks"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/eks"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elasticache/add_description_for_security_group.go b/checks/cloud/aws/elasticache/add_description_for_security_group.go
index bf56558f..38268256 100755
--- a/checks/cloud/aws/elasticache/add_description_for_security_group.go
+++ b/checks/cloud/aws/elasticache/add_description_for_security_group.go
@@ -1,11 +1,11 @@
 package elasticache
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddDescriptionForSecurityGroup = rules.Register(
diff --git a/checks/cloud/aws/elasticache/add_description_for_security_group_test.go b/checks/cloud/aws/elasticache/add_description_for_security_group_test.go
index d8f5facf..f4093acc 100644
--- a/checks/cloud/aws/elasticache/add_description_for_security_group_test.go
+++ b/checks/cloud/aws/elasticache/add_description_for_security_group_test.go
@@ -3,12 +3,12 @@ package elasticache
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticache"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticache"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elasticache/enable_at_rest_encryption.go b/checks/cloud/aws/elasticache/enable_at_rest_encryption.go
index f9f35ed2..52ce0a22 100755
--- a/checks/cloud/aws/elasticache/enable_at_rest_encryption.go
+++ b/checks/cloud/aws/elasticache/enable_at_rest_encryption.go
@@ -1,11 +1,11 @@
 package elasticache
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/aws/elasticache/enable_at_rest_encryption_test.go b/checks/cloud/aws/elasticache/enable_at_rest_encryption_test.go
index 0ec23934..e17f0c36 100644
--- a/checks/cloud/aws/elasticache/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/elasticache/enable_at_rest_encryption_test.go
@@ -3,12 +3,12 @@ package elasticache
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticache"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticache"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elasticache/enable_backup_retention.go b/checks/cloud/aws/elasticache/enable_backup_retention.go
index ac48a8ae..0266e4c4 100755
--- a/checks/cloud/aws/elasticache/enable_backup_retention.go
+++ b/checks/cloud/aws/elasticache/enable_backup_retention.go
@@ -1,11 +1,11 @@
 package elasticache
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableBackupRetention = rules.Register(
diff --git a/checks/cloud/aws/elasticache/enable_backup_retention_test.go b/checks/cloud/aws/elasticache/enable_backup_retention_test.go
index 8fa7d2e2..e0a8acb9 100644
--- a/checks/cloud/aws/elasticache/enable_backup_retention_test.go
+++ b/checks/cloud/aws/elasticache/enable_backup_retention_test.go
@@ -3,12 +3,12 @@ package elasticache
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticache"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticache"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elasticache/enable_in_transit_encryption.go b/checks/cloud/aws/elasticache/enable_in_transit_encryption.go
index 26a0502a..d5159207 100755
--- a/checks/cloud/aws/elasticache/enable_in_transit_encryption.go
+++ b/checks/cloud/aws/elasticache/enable_in_transit_encryption.go
@@ -1,11 +1,11 @@
 package elasticache
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableInTransitEncryption = rules.Register(
diff --git a/checks/cloud/aws/elasticache/enable_in_transit_encryption_test.go b/checks/cloud/aws/elasticache/enable_in_transit_encryption_test.go
index a9ce1dc0..29ce848d 100644
--- a/checks/cloud/aws/elasticache/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/elasticache/enable_in_transit_encryption_test.go
@@ -3,12 +3,12 @@ package elasticache
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticache"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticache"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elasticsearch/enable_domain_encryption.go b/checks/cloud/aws/elasticsearch/enable_domain_encryption.go
index ec0b9a4b..34abcddb 100755
--- a/checks/cloud/aws/elasticsearch/enable_domain_encryption.go
+++ b/checks/cloud/aws/elasticsearch/enable_domain_encryption.go
@@ -1,11 +1,11 @@
 package elasticsearch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableDomainEncryption = rules.Register(
diff --git a/checks/cloud/aws/elasticsearch/enable_domain_encryption_test.go b/checks/cloud/aws/elasticsearch/enable_domain_encryption_test.go
index 36df1c34..33575b84 100644
--- a/checks/cloud/aws/elasticsearch/enable_domain_encryption_test.go
+++ b/checks/cloud/aws/elasticsearch/enable_domain_encryption_test.go
@@ -3,12 +3,12 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticsearch"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticsearch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elasticsearch/enable_domain_logging.go b/checks/cloud/aws/elasticsearch/enable_domain_logging.go
index 6d774574..1b670669 100755
--- a/checks/cloud/aws/elasticsearch/enable_domain_logging.go
+++ b/checks/cloud/aws/elasticsearch/enable_domain_logging.go
@@ -1,11 +1,11 @@
 package elasticsearch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableDomainLogging = rules.Register(
diff --git a/checks/cloud/aws/elasticsearch/enable_domain_logging_test.go b/checks/cloud/aws/elasticsearch/enable_domain_logging_test.go
index c85d70f9..e6f26c16 100644
--- a/checks/cloud/aws/elasticsearch/enable_domain_logging_test.go
+++ b/checks/cloud/aws/elasticsearch/enable_domain_logging_test.go
@@ -3,12 +3,12 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticsearch"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticsearch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elasticsearch/enable_in_transit_encryption.go b/checks/cloud/aws/elasticsearch/enable_in_transit_encryption.go
index 0c73540b..6b156b17 100755
--- a/checks/cloud/aws/elasticsearch/enable_in_transit_encryption.go
+++ b/checks/cloud/aws/elasticsearch/enable_in_transit_encryption.go
@@ -1,11 +1,11 @@
 package elasticsearch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableInTransitEncryption = rules.Register(
diff --git a/checks/cloud/aws/elasticsearch/enable_in_transit_encryption_test.go b/checks/cloud/aws/elasticsearch/enable_in_transit_encryption_test.go
index 5442d8fa..c089356e 100644
--- a/checks/cloud/aws/elasticsearch/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/elasticsearch/enable_in_transit_encryption_test.go
@@ -3,12 +3,12 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticsearch"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticsearch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elasticsearch/enforce_https.go b/checks/cloud/aws/elasticsearch/enforce_https.go
index 6b131e32..5b12449f 100755
--- a/checks/cloud/aws/elasticsearch/enforce_https.go
+++ b/checks/cloud/aws/elasticsearch/enforce_https.go
@@ -1,11 +1,11 @@
 package elasticsearch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnforceHttps = rules.Register(
diff --git a/checks/cloud/aws/elasticsearch/enforce_https_test.go b/checks/cloud/aws/elasticsearch/enforce_https_test.go
index 6a5b0bd1..117fa543 100644
--- a/checks/cloud/aws/elasticsearch/enforce_https_test.go
+++ b/checks/cloud/aws/elasticsearch/enforce_https_test.go
@@ -3,12 +3,12 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticsearch"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticsearch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elasticsearch/use_secure_tls_policy.go b/checks/cloud/aws/elasticsearch/use_secure_tls_policy.go
index 2faefa33..e30b8f58 100755
--- a/checks/cloud/aws/elasticsearch/use_secure_tls_policy.go
+++ b/checks/cloud/aws/elasticsearch/use_secure_tls_policy.go
@@ -1,11 +1,11 @@
 package elasticsearch
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseSecureTlsPolicy = rules.Register(
diff --git a/checks/cloud/aws/elasticsearch/use_secure_tls_policy_test.go b/checks/cloud/aws/elasticsearch/use_secure_tls_policy_test.go
index f6148921..f7c4f016 100644
--- a/checks/cloud/aws/elasticsearch/use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/elasticsearch/use_secure_tls_policy_test.go
@@ -3,12 +3,12 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticsearch"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticsearch"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elb/alb_not_public.go b/checks/cloud/aws/elb/alb_not_public.go
index 13385ea7..4b295dca 100755
--- a/checks/cloud/aws/elb/alb_not_public.go
+++ b/checks/cloud/aws/elb/alb_not_public.go
@@ -1,12 +1,12 @@
 package elb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elb"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAlbNotPublic = rules.Register(
diff --git a/checks/cloud/aws/elb/alb_not_public_test.go b/checks/cloud/aws/elb/alb_not_public_test.go
index 081e991d..b6f1adfe 100644
--- a/checks/cloud/aws/elb/alb_not_public_test.go
+++ b/checks/cloud/aws/elb/alb_not_public_test.go
@@ -3,12 +3,12 @@ package elb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elb/drop_invalid_headers.go b/checks/cloud/aws/elb/drop_invalid_headers.go
index eacbf548..69df558f 100755
--- a/checks/cloud/aws/elb/drop_invalid_headers.go
+++ b/checks/cloud/aws/elb/drop_invalid_headers.go
@@ -1,12 +1,12 @@
 package elb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elb"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckDropInvalidHeaders = rules.Register(
diff --git a/checks/cloud/aws/elb/drop_invalid_headers_test.go b/checks/cloud/aws/elb/drop_invalid_headers_test.go
index bf374300..a2ce98f1 100644
--- a/checks/cloud/aws/elb/drop_invalid_headers_test.go
+++ b/checks/cloud/aws/elb/drop_invalid_headers_test.go
@@ -3,12 +3,12 @@ package elb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elb/http_not_used.go b/checks/cloud/aws/elb/http_not_used.go
index 47ba0753..c573ac0c 100755
--- a/checks/cloud/aws/elb/http_not_used.go
+++ b/checks/cloud/aws/elb/http_not_used.go
@@ -1,12 +1,12 @@
 package elb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elb"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckHttpNotUsed = rules.Register(
diff --git a/checks/cloud/aws/elb/http_not_used_test.go b/checks/cloud/aws/elb/http_not_used_test.go
index 03653d94..8c7ce3ba 100644
--- a/checks/cloud/aws/elb/http_not_used_test.go
+++ b/checks/cloud/aws/elb/http_not_used_test.go
@@ -3,12 +3,12 @@ package elb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/elb/use_secure_tls_policy.go b/checks/cloud/aws/elb/use_secure_tls_policy.go
index 5f438c9b..c6e219a2 100755
--- a/checks/cloud/aws/elb/use_secure_tls_policy.go
+++ b/checks/cloud/aws/elb/use_secure_tls_policy.go
@@ -1,11 +1,11 @@
 package elb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var outdatedSSLPolicies = []string{
diff --git a/checks/cloud/aws/elb/use_secure_tls_policy_test.go b/checks/cloud/aws/elb/use_secure_tls_policy_test.go
index 4569f245..064fb842 100644
--- a/checks/cloud/aws/elb/use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/elb/use_secure_tls_policy_test.go
@@ -3,12 +3,12 @@ package elb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/elb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/elb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/emr/enable_at_rest_encryption.go b/checks/cloud/aws/emr/enable_at_rest_encryption.go
index 2100b33b..ccbac904 100644
--- a/checks/cloud/aws/emr/enable_at_rest_encryption.go
+++ b/checks/cloud/aws/emr/enable_at_rest_encryption.go
@@ -3,11 +3,11 @@ package emr
 import (
 	"encoding/json"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/aws/emr/enable_at_rest_encryption_test.go b/checks/cloud/aws/emr/enable_at_rest_encryption_test.go
index 76138562..62fead0e 100644
--- a/checks/cloud/aws/emr/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/emr/enable_at_rest_encryption_test.go
@@ -3,11 +3,11 @@ package emr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/emr"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/emr"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/emr/enable_in_transit_encryption.go b/checks/cloud/aws/emr/enable_in_transit_encryption.go
index 8f711a66..813862be 100644
--- a/checks/cloud/aws/emr/enable_in_transit_encryption.go
+++ b/checks/cloud/aws/emr/enable_in_transit_encryption.go
@@ -3,11 +3,11 @@ package emr
 import (
 	"encoding/json"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableInTransitEncryption = rules.Register(
diff --git a/checks/cloud/aws/emr/enable_in_transit_encryption_test.go b/checks/cloud/aws/emr/enable_in_transit_encryption_test.go
index d7ef1864..b97af56a 100644
--- a/checks/cloud/aws/emr/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/emr/enable_in_transit_encryption_test.go
@@ -3,11 +3,11 @@ package emr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/emr"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/emr"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/emr/enable_local_disk_encryption.go b/checks/cloud/aws/emr/enable_local_disk_encryption.go
index 59ec394c..2a87bcff 100644
--- a/checks/cloud/aws/emr/enable_local_disk_encryption.go
+++ b/checks/cloud/aws/emr/enable_local_disk_encryption.go
@@ -3,11 +3,11 @@ package emr
 import (
 	"encoding/json"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableLocalDiskEncryption = rules.Register(
diff --git a/checks/cloud/aws/emr/enable_local_disk_encryption_test.go b/checks/cloud/aws/emr/enable_local_disk_encryption_test.go
index 5cfb197b..8b8ec8fe 100644
--- a/checks/cloud/aws/emr/enable_local_disk_encryption_test.go
+++ b/checks/cloud/aws/emr/enable_local_disk_encryption_test.go
@@ -3,11 +3,11 @@ package emr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/emr"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/emr"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/iam/disable_unused_credentials.go b/checks/cloud/aws/iam/disable_unused_credentials.go
index 1f5bf0f1..7b13cafb 100644
--- a/checks/cloud/aws/iam/disable_unused_credentials.go
+++ b/checks/cloud/aws/iam/disable_unused_credentials.go
@@ -4,17 +4,17 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckUnusedCredentialsDisabled = rules.Register(
diff --git a/checks/cloud/aws/iam/disable_unused_credentials_45.go b/checks/cloud/aws/iam/disable_unused_credentials_45.go
index 96f2ed89..7b8f7e2e 100644
--- a/checks/cloud/aws/iam/disable_unused_credentials_45.go
+++ b/checks/cloud/aws/iam/disable_unused_credentials_45.go
@@ -4,17 +4,17 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckUnusedCredentialsDisabled45Days = rules.Register(
diff --git a/checks/cloud/aws/iam/disable_unused_credentials_45_test.go b/checks/cloud/aws/iam/disable_unused_credentials_45_test.go
index 0cbc46c0..b47b3ae2 100644
--- a/checks/cloud/aws/iam/disable_unused_credentials_45_test.go
+++ b/checks/cloud/aws/iam/disable_unused_credentials_45_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/disable_unused_credentials_test.go b/checks/cloud/aws/iam/disable_unused_credentials_test.go
index 8d63b087..4cfcec15 100644
--- a/checks/cloud/aws/iam/disable_unused_credentials_test.go
+++ b/checks/cloud/aws/iam/disable_unused_credentials_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/enforce_group_mfa.go b/checks/cloud/aws/iam/enforce_group_mfa.go
index 1ab0945a..b4e8e38a 100644
--- a/checks/cloud/aws/iam/enforce_group_mfa.go
+++ b/checks/cloud/aws/iam/enforce_group_mfa.go
@@ -3,15 +3,15 @@ package iam
 import (
 	"strings"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckEnforceGroupMFA = rules.Register(
diff --git a/checks/cloud/aws/iam/enforce_group_mfa_test.go b/checks/cloud/aws/iam/enforce_group_mfa_test.go
index 0c2e5f29..b053bc7a 100644
--- a/checks/cloud/aws/iam/enforce_group_mfa_test.go
+++ b/checks/cloud/aws/iam/enforce_group_mfa_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/liamg/iamgo"
 
diff --git a/checks/cloud/aws/iam/enforce_root_hardware_mfa.go b/checks/cloud/aws/iam/enforce_root_hardware_mfa.go
index 16caef8c..e2231555 100644
--- a/checks/cloud/aws/iam/enforce_root_hardware_mfa.go
+++ b/checks/cloud/aws/iam/enforce_root_hardware_mfa.go
@@ -1,12 +1,12 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var checkRootHardwareMFAEnabled = rules.Register(
diff --git a/checks/cloud/aws/iam/enforce_root_hardware_mfa_test.go b/checks/cloud/aws/iam/enforce_root_hardware_mfa_test.go
index 5afc3e92..1f7e74eb 100644
--- a/checks/cloud/aws/iam/enforce_root_hardware_mfa_test.go
+++ b/checks/cloud/aws/iam/enforce_root_hardware_mfa_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/enforce_root_mfa.go b/checks/cloud/aws/iam/enforce_root_mfa.go
index 77be8725..5e393b3f 100644
--- a/checks/cloud/aws/iam/enforce_root_mfa.go
+++ b/checks/cloud/aws/iam/enforce_root_mfa.go
@@ -1,17 +1,17 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var checkRootMFAEnabled = rules.Register(
diff --git a/checks/cloud/aws/iam/enforce_root_mfa_test.go b/checks/cloud/aws/iam/enforce_root_mfa_test.go
index 74b29c7a..ad212965 100644
--- a/checks/cloud/aws/iam/enforce_root_mfa_test.go
+++ b/checks/cloud/aws/iam/enforce_root_mfa_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/enforce_user_mfa.go b/checks/cloud/aws/iam/enforce_user_mfa.go
index f9679fbc..55d9a6a5 100644
--- a/checks/cloud/aws/iam/enforce_user_mfa.go
+++ b/checks/cloud/aws/iam/enforce_user_mfa.go
@@ -1,17 +1,17 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckEnforceUserMFA = rules.Register(
diff --git a/checks/cloud/aws/iam/enforce_user_mfa_test.go b/checks/cloud/aws/iam/enforce_user_mfa_test.go
index 6f23d5ca..cac48d90 100644
--- a/checks/cloud/aws/iam/enforce_user_mfa_test.go
+++ b/checks/cloud/aws/iam/enforce_user_mfa_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/limit_root_account_usage.go b/checks/cloud/aws/iam/limit_root_account_usage.go
index 2df35db4..5f6922d9 100644
--- a/checks/cloud/aws/iam/limit_root_account_usage.go
+++ b/checks/cloud/aws/iam/limit_root_account_usage.go
@@ -3,17 +3,17 @@ package iam
 import (
 	"time"
 
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var checkLimitRootAccountUsage = rules.Register(
diff --git a/checks/cloud/aws/iam/limit_root_account_usage_test.go b/checks/cloud/aws/iam/limit_root_account_usage_test.go
index d8190054..c66357a0 100644
--- a/checks/cloud/aws/iam/limit_root_account_usage_test.go
+++ b/checks/cloud/aws/iam/limit_root_account_usage_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/limit_user_access_keys.go b/checks/cloud/aws/iam/limit_user_access_keys.go
index 904d6450..e176dd11 100644
--- a/checks/cloud/aws/iam/limit_user_access_keys.go
+++ b/checks/cloud/aws/iam/limit_user_access_keys.go
@@ -1,17 +1,17 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckLimitUserAccessKeys = rules.Register(
diff --git a/checks/cloud/aws/iam/limit_user_access_keys_test.go b/checks/cloud/aws/iam/limit_user_access_keys_test.go
index c74bbaa0..bb8d89ea 100644
--- a/checks/cloud/aws/iam/limit_user_access_keys_test.go
+++ b/checks/cloud/aws/iam/limit_user_access_keys_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/no_password_reuse.go b/checks/cloud/aws/iam/no_password_reuse.go
index e1d00de8..35d5af56 100755
--- a/checks/cloud/aws/iam/no_password_reuse.go
+++ b/checks/cloud/aws/iam/no_password_reuse.go
@@ -1,12 +1,12 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPasswordReuse = rules.Register(
diff --git a/checks/cloud/aws/iam/no_password_reuse_test.go b/checks/cloud/aws/iam/no_password_reuse_test.go
index 75d297e7..f96eb02b 100644
--- a/checks/cloud/aws/iam/no_password_reuse_test.go
+++ b/checks/cloud/aws/iam/no_password_reuse_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/no_policy_wildcards.go b/checks/cloud/aws/iam/no_policy_wildcards.go
index c364d0f8..60c8f758 100755
--- a/checks/cloud/aws/iam/no_policy_wildcards.go
+++ b/checks/cloud/aws/iam/no_policy_wildcards.go
@@ -5,13 +5,13 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/liamg/iamgo"
 )
 
diff --git a/checks/cloud/aws/iam/no_policy_wildcards_test.go b/checks/cloud/aws/iam/no_policy_wildcards_test.go
index a73c600a..516f8e1d 100644
--- a/checks/cloud/aws/iam/no_policy_wildcards_test.go
+++ b/checks/cloud/aws/iam/no_policy_wildcards_test.go
@@ -3,10 +3,10 @@ package iam
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/liamg/iamgo"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/no_root_access_keys.go b/checks/cloud/aws/iam/no_root_access_keys.go
index 3078c18d..51757ac9 100644
--- a/checks/cloud/aws/iam/no_root_access_keys.go
+++ b/checks/cloud/aws/iam/no_root_access_keys.go
@@ -1,17 +1,17 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var checkNoRootAccessKeys = rules.Register(
diff --git a/checks/cloud/aws/iam/no_root_access_keys_test.go b/checks/cloud/aws/iam/no_root_access_keys_test.go
index 3ef5f529..7b4a182b 100644
--- a/checks/cloud/aws/iam/no_root_access_keys_test.go
+++ b/checks/cloud/aws/iam/no_root_access_keys_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/no_user_attached_policies.go b/checks/cloud/aws/iam/no_user_attached_policies.go
index 0b8653ee..02785387 100644
--- a/checks/cloud/aws/iam/no_user_attached_policies.go
+++ b/checks/cloud/aws/iam/no_user_attached_policies.go
@@ -1,17 +1,17 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var checkNoUserAttachedPolicies = rules.Register(
diff --git a/checks/cloud/aws/iam/no_user_attached_policies_test.go b/checks/cloud/aws/iam/no_user_attached_policies_test.go
index d0e71a4c..b6941aee 100644
--- a/checks/cloud/aws/iam/no_user_attached_policies_test.go
+++ b/checks/cloud/aws/iam/no_user_attached_policies_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/remove_expired_certificates.go b/checks/cloud/aws/iam/remove_expired_certificates.go
index 16211576..2a94de59 100644
--- a/checks/cloud/aws/iam/remove_expired_certificates.go
+++ b/checks/cloud/aws/iam/remove_expired_certificates.go
@@ -3,17 +3,17 @@ package iam
 import (
 	"time"
 
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckRemoveExpiredCertificates = rules.Register(
diff --git a/checks/cloud/aws/iam/remove_expired_certificates_test.go b/checks/cloud/aws/iam/remove_expired_certificates_test.go
index 3e2445bc..f9bd5ced 100644
--- a/checks/cloud/aws/iam/remove_expired_certificates_test.go
+++ b/checks/cloud/aws/iam/remove_expired_certificates_test.go
@@ -4,11 +4,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aquasecurity/defsec/pkg/state"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/require_lowercase_in_passwords.go b/checks/cloud/aws/iam/require_lowercase_in_passwords.go
index f4012f59..cabfec40 100755
--- a/checks/cloud/aws/iam/require_lowercase_in_passwords.go
+++ b/checks/cloud/aws/iam/require_lowercase_in_passwords.go
@@ -1,12 +1,12 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRequireLowercaseInPasswords = rules.Register(
diff --git a/checks/cloud/aws/iam/require_lowercase_in_passwords_test.go b/checks/cloud/aws/iam/require_lowercase_in_passwords_test.go
index 60e5c3bd..f988708a 100644
--- a/checks/cloud/aws/iam/require_lowercase_in_passwords_test.go
+++ b/checks/cloud/aws/iam/require_lowercase_in_passwords_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/require_numbers_in_passwords.go b/checks/cloud/aws/iam/require_numbers_in_passwords.go
index 3d9c346b..86108582 100755
--- a/checks/cloud/aws/iam/require_numbers_in_passwords.go
+++ b/checks/cloud/aws/iam/require_numbers_in_passwords.go
@@ -1,12 +1,12 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRequireNumbersInPasswords = rules.Register(
diff --git a/checks/cloud/aws/iam/require_numbers_in_passwords_test.go b/checks/cloud/aws/iam/require_numbers_in_passwords_test.go
index 7fc08b8d..2304a792 100644
--- a/checks/cloud/aws/iam/require_numbers_in_passwords_test.go
+++ b/checks/cloud/aws/iam/require_numbers_in_passwords_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/require_support_role.go b/checks/cloud/aws/iam/require_support_role.go
index bd34704a..dfc793ed 100644
--- a/checks/cloud/aws/iam/require_support_role.go
+++ b/checks/cloud/aws/iam/require_support_role.go
@@ -1,18 +1,18 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckRequireSupportRole = rules.Register(
diff --git a/checks/cloud/aws/iam/require_support_role_test.go b/checks/cloud/aws/iam/require_support_role_test.go
index 3cd2e242..e10de05e 100644
--- a/checks/cloud/aws/iam/require_support_role_test.go
+++ b/checks/cloud/aws/iam/require_support_role_test.go
@@ -3,11 +3,11 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/require_symbols_in_passwords.go b/checks/cloud/aws/iam/require_symbols_in_passwords.go
index ee875b39..cfb94e04 100755
--- a/checks/cloud/aws/iam/require_symbols_in_passwords.go
+++ b/checks/cloud/aws/iam/require_symbols_in_passwords.go
@@ -1,12 +1,12 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRequireSymbolsInPasswords = rules.Register(
diff --git a/checks/cloud/aws/iam/require_symbols_in_passwords_test.go b/checks/cloud/aws/iam/require_symbols_in_passwords_test.go
index b8247568..ca08053e 100644
--- a/checks/cloud/aws/iam/require_symbols_in_passwords_test.go
+++ b/checks/cloud/aws/iam/require_symbols_in_passwords_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/require_uppercase_in_passwords.go b/checks/cloud/aws/iam/require_uppercase_in_passwords.go
index 6d0797ae..a03d107d 100755
--- a/checks/cloud/aws/iam/require_uppercase_in_passwords.go
+++ b/checks/cloud/aws/iam/require_uppercase_in_passwords.go
@@ -1,12 +1,12 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRequireUppercaseInPasswords = rules.Register(
diff --git a/checks/cloud/aws/iam/require_uppercase_in_passwords_test.go b/checks/cloud/aws/iam/require_uppercase_in_passwords_test.go
index ad39c5bf..67d49cb0 100644
--- a/checks/cloud/aws/iam/require_uppercase_in_passwords_test.go
+++ b/checks/cloud/aws/iam/require_uppercase_in_passwords_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/rotate_access_keys.go b/checks/cloud/aws/iam/rotate_access_keys.go
index bacb450c..a001c139 100644
--- a/checks/cloud/aws/iam/rotate_access_keys.go
+++ b/checks/cloud/aws/iam/rotate_access_keys.go
@@ -4,17 +4,17 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/aquasecurity/defsec/pkg/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckAccessKeysRotated = rules.Register(
diff --git a/checks/cloud/aws/iam/rotate_access_keys_test.go b/checks/cloud/aws/iam/rotate_access_keys_test.go
index e1fbc0cd..5d25169b 100644
--- a/checks/cloud/aws/iam/rotate_access_keys_test.go
+++ b/checks/cloud/aws/iam/rotate_access_keys_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/set_max_password_age.go b/checks/cloud/aws/iam/set_max_password_age.go
index 9a76be4d..cbc02746 100755
--- a/checks/cloud/aws/iam/set_max_password_age.go
+++ b/checks/cloud/aws/iam/set_max_password_age.go
@@ -1,12 +1,12 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckSetMaxPasswordAge = rules.Register(
diff --git a/checks/cloud/aws/iam/set_max_password_age_test.go b/checks/cloud/aws/iam/set_max_password_age_test.go
index 480169a2..40c695c6 100644
--- a/checks/cloud/aws/iam/set_max_password_age_test.go
+++ b/checks/cloud/aws/iam/set_max_password_age_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/iam/set_minimum_password_length.go b/checks/cloud/aws/iam/set_minimum_password_length.go
index 8725ded2..79d31743 100755
--- a/checks/cloud/aws/iam/set_minimum_password_length.go
+++ b/checks/cloud/aws/iam/set_minimum_password_length.go
@@ -1,12 +1,12 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckSetMinimumPasswordLength = rules.Register(
diff --git a/checks/cloud/aws/iam/set_minimum_password_length_test.go b/checks/cloud/aws/iam/set_minimum_password_length_test.go
index 4e45426a..d1b3512d 100644
--- a/checks/cloud/aws/iam/set_minimum_password_length_test.go
+++ b/checks/cloud/aws/iam/set_minimum_password_length_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/kinesis/enable_in_transit_encryption.go b/checks/cloud/aws/kinesis/enable_in_transit_encryption.go
index aef501cb..a7c499bf 100755
--- a/checks/cloud/aws/kinesis/enable_in_transit_encryption.go
+++ b/checks/cloud/aws/kinesis/enable_in_transit_encryption.go
@@ -1,12 +1,12 @@
 package kinesis
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/kinesis"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/kinesis"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableInTransitEncryption = rules.Register(
diff --git a/checks/cloud/aws/kinesis/enable_in_transit_encryption_test.go b/checks/cloud/aws/kinesis/enable_in_transit_encryption_test.go
index 994b0f97..71eea507 100644
--- a/checks/cloud/aws/kinesis/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/kinesis/enable_in_transit_encryption_test.go
@@ -3,12 +3,12 @@ package kinesis
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/kinesis"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/kinesis"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/kms/auto_rotate_keys.go b/checks/cloud/aws/kms/auto_rotate_keys.go
index 38a6b597..37b7138e 100755
--- a/checks/cloud/aws/kms/auto_rotate_keys.go
+++ b/checks/cloud/aws/kms/auto_rotate_keys.go
@@ -1,12 +1,12 @@
 package kms
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/kms"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/kms"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAutoRotateKeys = rules.Register(
diff --git a/checks/cloud/aws/kms/auto_rotate_keys_test.go b/checks/cloud/aws/kms/auto_rotate_keys_test.go
index 40b4abbb..390349bf 100644
--- a/checks/cloud/aws/kms/auto_rotate_keys_test.go
+++ b/checks/cloud/aws/kms/auto_rotate_keys_test.go
@@ -3,12 +3,12 @@ package kms
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/kms"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/kms"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/lambda/enable_tracing.go b/checks/cloud/aws/lambda/enable_tracing.go
index 0c441fbe..0244c73d 100755
--- a/checks/cloud/aws/lambda/enable_tracing.go
+++ b/checks/cloud/aws/lambda/enable_tracing.go
@@ -1,12 +1,12 @@
 package lambda
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/lambda"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/lambda"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableTracing = rules.Register(
diff --git a/checks/cloud/aws/lambda/enable_tracing_test.go b/checks/cloud/aws/lambda/enable_tracing_test.go
index a5d5d6b7..9dd5a732 100644
--- a/checks/cloud/aws/lambda/enable_tracing_test.go
+++ b/checks/cloud/aws/lambda/enable_tracing_test.go
@@ -3,12 +3,12 @@ package lambda
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/lambda"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/lambda"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/lambda/restrict_source_arn.go b/checks/cloud/aws/lambda/restrict_source_arn.go
index 8264cca9..af3c0055 100755
--- a/checks/cloud/aws/lambda/restrict_source_arn.go
+++ b/checks/cloud/aws/lambda/restrict_source_arn.go
@@ -1,11 +1,11 @@
 package lambda
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRestrictSourceArn = rules.Register(
diff --git a/checks/cloud/aws/lambda/restrict_source_arn_test.go b/checks/cloud/aws/lambda/restrict_source_arn_test.go
index f38496d1..1706b7ad 100644
--- a/checks/cloud/aws/lambda/restrict_source_arn_test.go
+++ b/checks/cloud/aws/lambda/restrict_source_arn_test.go
@@ -3,12 +3,12 @@ package lambda
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/lambda"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/lambda"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/mq/enable_audit_logging.go b/checks/cloud/aws/mq/enable_audit_logging.go
index f1dd95dc..43e9a32c 100755
--- a/checks/cloud/aws/mq/enable_audit_logging.go
+++ b/checks/cloud/aws/mq/enable_audit_logging.go
@@ -1,11 +1,11 @@
 package mq
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAuditLogging = rules.Register(
diff --git a/checks/cloud/aws/mq/enable_audit_logging_test.go b/checks/cloud/aws/mq/enable_audit_logging_test.go
index 495e8530..a2fcc8b0 100644
--- a/checks/cloud/aws/mq/enable_audit_logging_test.go
+++ b/checks/cloud/aws/mq/enable_audit_logging_test.go
@@ -3,13 +3,13 @@ package mq
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/mq"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/mq"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/mq/enable_general_logging.go b/checks/cloud/aws/mq/enable_general_logging.go
index 87b96e53..7e7169a7 100755
--- a/checks/cloud/aws/mq/enable_general_logging.go
+++ b/checks/cloud/aws/mq/enable_general_logging.go
@@ -1,11 +1,11 @@
 package mq
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableGeneralLogging = rules.Register(
diff --git a/checks/cloud/aws/mq/enable_general_logging_test.go b/checks/cloud/aws/mq/enable_general_logging_test.go
index 0fef0824..c7b57fc8 100644
--- a/checks/cloud/aws/mq/enable_general_logging_test.go
+++ b/checks/cloud/aws/mq/enable_general_logging_test.go
@@ -3,12 +3,12 @@ package mq
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/mq"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/mq"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/mq/no_public_access.go b/checks/cloud/aws/mq/no_public_access.go
index f2c45af2..7112dd0a 100755
--- a/checks/cloud/aws/mq/no_public_access.go
+++ b/checks/cloud/aws/mq/no_public_access.go
@@ -1,11 +1,11 @@
 package mq
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/aws/mq/no_public_access_test.go b/checks/cloud/aws/mq/no_public_access_test.go
index 13eaf169..ba762815 100644
--- a/checks/cloud/aws/mq/no_public_access_test.go
+++ b/checks/cloud/aws/mq/no_public_access_test.go
@@ -3,12 +3,12 @@ package mq
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/mq"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/mq"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/msk/enable_at_rest_encryption.go b/checks/cloud/aws/msk/enable_at_rest_encryption.go
index 2e100b22..d6a9f630 100644
--- a/checks/cloud/aws/msk/enable_at_rest_encryption.go
+++ b/checks/cloud/aws/msk/enable_at_rest_encryption.go
@@ -1,11 +1,11 @@
 package msk
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/aws/msk/enable_at_rest_encryption_test.go b/checks/cloud/aws/msk/enable_at_rest_encryption_test.go
index 238be4cf..e3ee6eae 100644
--- a/checks/cloud/aws/msk/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/msk/enable_at_rest_encryption_test.go
@@ -3,12 +3,12 @@ package msk
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/msk"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/msk"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/msk/enable_in_transit_encryption.go b/checks/cloud/aws/msk/enable_in_transit_encryption.go
index 3931940b..f5ee6cdc 100755
--- a/checks/cloud/aws/msk/enable_in_transit_encryption.go
+++ b/checks/cloud/aws/msk/enable_in_transit_encryption.go
@@ -1,12 +1,12 @@
 package msk
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/msk"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/msk"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableInTransitEncryption = rules.Register(
diff --git a/checks/cloud/aws/msk/enable_in_transit_encryption_test.go b/checks/cloud/aws/msk/enable_in_transit_encryption_test.go
index 4a919248..5343a0ca 100644
--- a/checks/cloud/aws/msk/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/msk/enable_in_transit_encryption_test.go
@@ -3,12 +3,12 @@ package msk
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/msk"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/msk"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/msk/enable_logging.go b/checks/cloud/aws/msk/enable_logging.go
index eafea77d..06eeecc5 100755
--- a/checks/cloud/aws/msk/enable_logging.go
+++ b/checks/cloud/aws/msk/enable_logging.go
@@ -1,11 +1,11 @@
 package msk
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableLogging = rules.Register(
diff --git a/checks/cloud/aws/msk/enable_logging_test.go b/checks/cloud/aws/msk/enable_logging_test.go
index 0f0af5b5..43e2b28c 100644
--- a/checks/cloud/aws/msk/enable_logging_test.go
+++ b/checks/cloud/aws/msk/enable_logging_test.go
@@ -3,12 +3,12 @@ package msk
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/msk"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/msk"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/neptune/enable_log_export.go b/checks/cloud/aws/neptune/enable_log_export.go
index fad2bec8..d1f163ae 100755
--- a/checks/cloud/aws/neptune/enable_log_export.go
+++ b/checks/cloud/aws/neptune/enable_log_export.go
@@ -1,11 +1,11 @@
 package neptune
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableLogExport = rules.Register(
diff --git a/checks/cloud/aws/neptune/enable_log_export_test.go b/checks/cloud/aws/neptune/enable_log_export_test.go
index 224fed63..d448c11f 100644
--- a/checks/cloud/aws/neptune/enable_log_export_test.go
+++ b/checks/cloud/aws/neptune/enable_log_export_test.go
@@ -3,12 +3,12 @@ package neptune
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/neptune"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/neptune"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/neptune/enable_storage_encryption.go b/checks/cloud/aws/neptune/enable_storage_encryption.go
index 7f0c1101..c9dfef27 100755
--- a/checks/cloud/aws/neptune/enable_storage_encryption.go
+++ b/checks/cloud/aws/neptune/enable_storage_encryption.go
@@ -1,11 +1,11 @@
 package neptune
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableStorageEncryption = rules.Register(
diff --git a/checks/cloud/aws/neptune/enable_storage_encryption_test.go b/checks/cloud/aws/neptune/enable_storage_encryption_test.go
index 298a0aad..22bdc448 100644
--- a/checks/cloud/aws/neptune/enable_storage_encryption_test.go
+++ b/checks/cloud/aws/neptune/enable_storage_encryption_test.go
@@ -3,12 +3,12 @@ package neptune
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/neptune"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/neptune"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/neptune/encryption_customer_key.go b/checks/cloud/aws/neptune/encryption_customer_key.go
index e60ada91..16791a8c 100755
--- a/checks/cloud/aws/neptune/encryption_customer_key.go
+++ b/checks/cloud/aws/neptune/encryption_customer_key.go
@@ -1,11 +1,11 @@
 package neptune
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEncryptionCustomerKey = rules.Register(
diff --git a/checks/cloud/aws/neptune/encryption_customer_key_test.go b/checks/cloud/aws/neptune/encryption_customer_key_test.go
index 36537c11..ace7e3c7 100644
--- a/checks/cloud/aws/neptune/encryption_customer_key_test.go
+++ b/checks/cloud/aws/neptune/encryption_customer_key_test.go
@@ -3,12 +3,12 @@ package neptune
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/neptune"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/neptune"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/rds/enable_performance_insights.go b/checks/cloud/aws/rds/enable_performance_insights.go
index 1a2eb4fa..c7c227a4 100755
--- a/checks/cloud/aws/rds/enable_performance_insights.go
+++ b/checks/cloud/aws/rds/enable_performance_insights.go
@@ -1,11 +1,11 @@
 package rds
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnablePerformanceInsights = rules.Register(
diff --git a/checks/cloud/aws/rds/enable_performance_insights_test.go b/checks/cloud/aws/rds/enable_performance_insights_test.go
index f8773cf5..4447bf44 100644
--- a/checks/cloud/aws/rds/enable_performance_insights_test.go
+++ b/checks/cloud/aws/rds/enable_performance_insights_test.go
@@ -3,12 +3,12 @@ package rds
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/rds"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/rds/encrypt_cluster_storage_data.go b/checks/cloud/aws/rds/encrypt_cluster_storage_data.go
index c29e6e0c..5fe4d9ee 100755
--- a/checks/cloud/aws/rds/encrypt_cluster_storage_data.go
+++ b/checks/cloud/aws/rds/encrypt_cluster_storage_data.go
@@ -1,11 +1,11 @@
 package rds
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEncryptClusterStorageData = rules.Register(
diff --git a/checks/cloud/aws/rds/encrypt_cluster_storage_data_test.go b/checks/cloud/aws/rds/encrypt_cluster_storage_data_test.go
index 0bd9be76..bb0582b1 100644
--- a/checks/cloud/aws/rds/encrypt_cluster_storage_data_test.go
+++ b/checks/cloud/aws/rds/encrypt_cluster_storage_data_test.go
@@ -3,12 +3,12 @@ package rds
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/rds"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/rds/encrypt_instance_storage_data.go b/checks/cloud/aws/rds/encrypt_instance_storage_data.go
index f802296e..bcd49e28 100755
--- a/checks/cloud/aws/rds/encrypt_instance_storage_data.go
+++ b/checks/cloud/aws/rds/encrypt_instance_storage_data.go
@@ -1,11 +1,11 @@
 package rds
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEncryptInstanceStorageData = rules.Register(
diff --git a/checks/cloud/aws/rds/encrypt_instance_storage_data_test.go b/checks/cloud/aws/rds/encrypt_instance_storage_data_test.go
index bfa19f65..d0b52803 100644
--- a/checks/cloud/aws/rds/encrypt_instance_storage_data_test.go
+++ b/checks/cloud/aws/rds/encrypt_instance_storage_data_test.go
@@ -3,12 +3,12 @@ package rds
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/rds"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/rds/no_classic_resources.go b/checks/cloud/aws/rds/no_classic_resources.go
index c1ad72bc..4c374606 100755
--- a/checks/cloud/aws/rds/no_classic_resources.go
+++ b/checks/cloud/aws/rds/no_classic_resources.go
@@ -1,11 +1,11 @@
 package rds
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoClassicResources = rules.Register(
diff --git a/checks/cloud/aws/rds/no_classic_resources_test.go b/checks/cloud/aws/rds/no_classic_resources_test.go
index a04d4049..a2d7a74a 100644
--- a/checks/cloud/aws/rds/no_classic_resources_test.go
+++ b/checks/cloud/aws/rds/no_classic_resources_test.go
@@ -3,12 +3,12 @@ package rds
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/rds"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/rds/performance_insights_encryption_customer_key.go b/checks/cloud/aws/rds/performance_insights_encryption_customer_key.go
index be24e035..8bb9e142 100755
--- a/checks/cloud/aws/rds/performance_insights_encryption_customer_key.go
+++ b/checks/cloud/aws/rds/performance_insights_encryption_customer_key.go
@@ -3,11 +3,11 @@ package rds
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/rds"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 )
diff --git a/checks/cloud/aws/rds/performance_insights_encryption_customer_key_test.go b/checks/cloud/aws/rds/performance_insights_encryption_customer_key_test.go
index 0dff469f..a3d742ec 100644
--- a/checks/cloud/aws/rds/performance_insights_encryption_customer_key_test.go
+++ b/checks/cloud/aws/rds/performance_insights_encryption_customer_key_test.go
@@ -3,10 +3,10 @@ package rds
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/rds"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/aws/rds/specify_backup_retention.go b/checks/cloud/aws/rds/specify_backup_retention.go
index 953da161..2492607a 100755
--- a/checks/cloud/aws/rds/specify_backup_retention.go
+++ b/checks/cloud/aws/rds/specify_backup_retention.go
@@ -1,11 +1,11 @@
 package rds
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckBackupRetentionSpecified = rules.Register(
diff --git a/checks/cloud/aws/rds/specify_backup_retention_test.go b/checks/cloud/aws/rds/specify_backup_retention_test.go
index 4eb803d8..38cdaf42 100644
--- a/checks/cloud/aws/rds/specify_backup_retention_test.go
+++ b/checks/cloud/aws/rds/specify_backup_retention_test.go
@@ -3,12 +3,12 @@ package rds
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/rds"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/redshift/add_description_to_security_group.go b/checks/cloud/aws/redshift/add_description_to_security_group.go
index 8b6c1905..99b058d3 100755
--- a/checks/cloud/aws/redshift/add_description_to_security_group.go
+++ b/checks/cloud/aws/redshift/add_description_to_security_group.go
@@ -1,11 +1,11 @@
 package redshift
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddDescriptionToSecurityGroup = rules.Register(
diff --git a/checks/cloud/aws/redshift/add_description_to_security_group_test.go b/checks/cloud/aws/redshift/add_description_to_security_group_test.go
index 193b5e2a..68b6a984 100644
--- a/checks/cloud/aws/redshift/add_description_to_security_group_test.go
+++ b/checks/cloud/aws/redshift/add_description_to_security_group_test.go
@@ -3,12 +3,12 @@ package redshift
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/redshift"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/redshift"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/redshift/encryption_customer_key.go b/checks/cloud/aws/redshift/encryption_customer_key.go
index 42efe722..8779b4cd 100755
--- a/checks/cloud/aws/redshift/encryption_customer_key.go
+++ b/checks/cloud/aws/redshift/encryption_customer_key.go
@@ -1,11 +1,11 @@
 package redshift
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEncryptionCustomerKey = rules.Register(
diff --git a/checks/cloud/aws/redshift/encryption_customer_key_test.go b/checks/cloud/aws/redshift/encryption_customer_key_test.go
index 89c6a7ab..da0db754 100644
--- a/checks/cloud/aws/redshift/encryption_customer_key_test.go
+++ b/checks/cloud/aws/redshift/encryption_customer_key_test.go
@@ -3,12 +3,12 @@ package redshift
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/redshift"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/redshift"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/redshift/no_classic_resources.go b/checks/cloud/aws/redshift/no_classic_resources.go
index 822b2753..c025cad5 100755
--- a/checks/cloud/aws/redshift/no_classic_resources.go
+++ b/checks/cloud/aws/redshift/no_classic_resources.go
@@ -1,11 +1,11 @@
 package redshift
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoClassicResources = rules.Register(
diff --git a/checks/cloud/aws/redshift/no_classic_resources_test.go b/checks/cloud/aws/redshift/no_classic_resources_test.go
index d6486abc..b4c7c516 100644
--- a/checks/cloud/aws/redshift/no_classic_resources_test.go
+++ b/checks/cloud/aws/redshift/no_classic_resources_test.go
@@ -3,12 +3,12 @@ package redshift
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/redshift"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/redshift"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/redshift/use_vpc.go b/checks/cloud/aws/redshift/use_vpc.go
index 442780d3..6279065f 100755
--- a/checks/cloud/aws/redshift/use_vpc.go
+++ b/checks/cloud/aws/redshift/use_vpc.go
@@ -1,11 +1,11 @@
 package redshift
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUsesVPC = rules.Register(
diff --git a/checks/cloud/aws/redshift/use_vpc_test.go b/checks/cloud/aws/redshift/use_vpc_test.go
index 921ffeb2..1390111c 100644
--- a/checks/cloud/aws/redshift/use_vpc_test.go
+++ b/checks/cloud/aws/redshift/use_vpc_test.go
@@ -3,12 +3,12 @@ package redshift
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/redshift"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/redshift"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/block_public_acls.go b/checks/cloud/aws/s3/block_public_acls.go
index 913720b9..9cbfb708 100755
--- a/checks/cloud/aws/s3/block_public_acls.go
+++ b/checks/cloud/aws/s3/block_public_acls.go
@@ -1,11 +1,11 @@
 package s3
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPublicACLsAreBlocked = rules.Register(
diff --git a/checks/cloud/aws/s3/block_public_acls_test.go b/checks/cloud/aws/s3/block_public_acls_test.go
index 8b7c8899..46b3d8d4 100644
--- a/checks/cloud/aws/s3/block_public_acls_test.go
+++ b/checks/cloud/aws/s3/block_public_acls_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/block_public_policy.go b/checks/cloud/aws/s3/block_public_policy.go
index 99521e27..b4f5fdf2 100755
--- a/checks/cloud/aws/s3/block_public_policy.go
+++ b/checks/cloud/aws/s3/block_public_policy.go
@@ -1,11 +1,11 @@
 package s3
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPublicPoliciesAreBlocked = rules.Register(
diff --git a/checks/cloud/aws/s3/block_public_policy_test.go b/checks/cloud/aws/s3/block_public_policy_test.go
index 39bd938e..e43afb4a 100644
--- a/checks/cloud/aws/s3/block_public_policy_test.go
+++ b/checks/cloud/aws/s3/block_public_policy_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/enable_bucket_encryption.go b/checks/cloud/aws/s3/enable_bucket_encryption.go
index de7f2c7c..758f1ffd 100755
--- a/checks/cloud/aws/s3/enable_bucket_encryption.go
+++ b/checks/cloud/aws/s3/enable_bucket_encryption.go
@@ -1,11 +1,11 @@
 package s3
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEncryptionIsEnabled = rules.Register(
diff --git a/checks/cloud/aws/s3/enable_bucket_encryption_test.go b/checks/cloud/aws/s3/enable_bucket_encryption_test.go
index fce5f3f6..0fa8ce3a 100644
--- a/checks/cloud/aws/s3/enable_bucket_encryption_test.go
+++ b/checks/cloud/aws/s3/enable_bucket_encryption_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/enable_object_read_logging.go b/checks/cloud/aws/s3/enable_object_read_logging.go
index 956d41d3..8bd0c879 100755
--- a/checks/cloud/aws/s3/enable_object_read_logging.go
+++ b/checks/cloud/aws/s3/enable_object_read_logging.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableObjectReadLogging = rules.Register(
diff --git a/checks/cloud/aws/s3/enable_object_read_logging_test.go b/checks/cloud/aws/s3/enable_object_read_logging_test.go
index 8f90bf21..ec7b9e28 100644
--- a/checks/cloud/aws/s3/enable_object_read_logging_test.go
+++ b/checks/cloud/aws/s3/enable_object_read_logging_test.go
@@ -3,13 +3,13 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/enable_object_write_logging.go b/checks/cloud/aws/s3/enable_object_write_logging.go
index 2803dc8f..59fab7e8 100755
--- a/checks/cloud/aws/s3/enable_object_write_logging.go
+++ b/checks/cloud/aws/s3/enable_object_write_logging.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableObjectWriteLogging = rules.Register(
diff --git a/checks/cloud/aws/s3/enable_object_write_logging_test.go b/checks/cloud/aws/s3/enable_object_write_logging_test.go
index 8da05c61..2136da6a 100644
--- a/checks/cloud/aws/s3/enable_object_write_logging_test.go
+++ b/checks/cloud/aws/s3/enable_object_write_logging_test.go
@@ -3,13 +3,13 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/enable_versioning.go b/checks/cloud/aws/s3/enable_versioning.go
index c2c40313..3c22238d 100755
--- a/checks/cloud/aws/s3/enable_versioning.go
+++ b/checks/cloud/aws/s3/enable_versioning.go
@@ -1,11 +1,11 @@
 package s3
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckVersioningIsEnabled = rules.Register(
diff --git a/checks/cloud/aws/s3/enable_versioning_test.go b/checks/cloud/aws/s3/enable_versioning_test.go
index d92f60a5..5b03d69f 100644
--- a/checks/cloud/aws/s3/enable_versioning_test.go
+++ b/checks/cloud/aws/s3/enable_versioning_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/encryption_customer_key.go b/checks/cloud/aws/s3/encryption_customer_key.go
index c3a3584a..0e62e14f 100755
--- a/checks/cloud/aws/s3/encryption_customer_key.go
+++ b/checks/cloud/aws/s3/encryption_customer_key.go
@@ -1,12 +1,12 @@
 package s3
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var CheckEncryptionCustomerKey = rules.Register(
diff --git a/checks/cloud/aws/s3/encryption_customer_key_test.go b/checks/cloud/aws/s3/encryption_customer_key_test.go
index c3828b42..0e0a4267 100644
--- a/checks/cloud/aws/s3/encryption_customer_key_test.go
+++ b/checks/cloud/aws/s3/encryption_customer_key_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/ignore_public_acls.go b/checks/cloud/aws/s3/ignore_public_acls.go
index 3d94a38d..f83a8ae0 100755
--- a/checks/cloud/aws/s3/ignore_public_acls.go
+++ b/checks/cloud/aws/s3/ignore_public_acls.go
@@ -1,11 +1,11 @@
 package s3
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPublicACLsAreIgnored = rules.Register(
diff --git a/checks/cloud/aws/s3/ignore_public_acls_test.go b/checks/cloud/aws/s3/ignore_public_acls_test.go
index 20456700..0b85ffa9 100644
--- a/checks/cloud/aws/s3/ignore_public_acls_test.go
+++ b/checks/cloud/aws/s3/ignore_public_acls_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/no_public_access_with_acl.go b/checks/cloud/aws/s3/no_public_access_with_acl.go
index 706decdf..f3796a86 100755
--- a/checks/cloud/aws/s3/no_public_access_with_acl.go
+++ b/checks/cloud/aws/s3/no_public_access_with_acl.go
@@ -3,15 +3,15 @@ package s3
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckForPublicACL = rules.Register(
diff --git a/checks/cloud/aws/s3/no_public_access_with_acl_test.go b/checks/cloud/aws/s3/no_public_access_with_acl_test.go
index c425862d..c4d0d1c5 100644
--- a/checks/cloud/aws/s3/no_public_access_with_acl_test.go
+++ b/checks/cloud/aws/s3/no_public_access_with_acl_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/no_public_buckets.go b/checks/cloud/aws/s3/no_public_buckets.go
index 84b97516..3196a735 100755
--- a/checks/cloud/aws/s3/no_public_buckets.go
+++ b/checks/cloud/aws/s3/no_public_buckets.go
@@ -1,11 +1,11 @@
 package s3
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPublicBucketsAreRestricted = rules.Register(
diff --git a/checks/cloud/aws/s3/no_public_buckets_test.go b/checks/cloud/aws/s3/no_public_buckets_test.go
index 9e08fb42..116bae13 100644
--- a/checks/cloud/aws/s3/no_public_buckets_test.go
+++ b/checks/cloud/aws/s3/no_public_buckets_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/require_mfa_delete.go b/checks/cloud/aws/s3/require_mfa_delete.go
index df00ac3c..744bc726 100755
--- a/checks/cloud/aws/s3/require_mfa_delete.go
+++ b/checks/cloud/aws/s3/require_mfa_delete.go
@@ -1,12 +1,12 @@
 package s3
 
 import (
-	"github.com/aquasecurity/defsec/pkg/framework"
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/framework"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRequireMFADelete = rules.Register(
diff --git a/checks/cloud/aws/s3/require_mfa_delete_test.go b/checks/cloud/aws/s3/require_mfa_delete_test.go
index ed468e1f..86f7c2fb 100644
--- a/checks/cloud/aws/s3/require_mfa_delete_test.go
+++ b/checks/cloud/aws/s3/require_mfa_delete_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/s3/specify_public_access_block.go b/checks/cloud/aws/s3/specify_public_access_block.go
index 54aa3b26..f457c671 100755
--- a/checks/cloud/aws/s3/specify_public_access_block.go
+++ b/checks/cloud/aws/s3/specify_public_access_block.go
@@ -1,11 +1,11 @@
 package s3
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckBucketsHavePublicAccessBlocks = rules.Register(
diff --git a/checks/cloud/aws/s3/specify_public_access_block_test.go b/checks/cloud/aws/s3/specify_public_access_block_test.go
index e241022e..e5a407bd 100644
--- a/checks/cloud/aws/s3/specify_public_access_block_test.go
+++ b/checks/cloud/aws/s3/specify_public_access_block_test.go
@@ -3,12 +3,12 @@ package s3
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/s3"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/api_use_secure_tls_policy.go b/checks/cloud/aws/sam/api_use_secure_tls_policy.go
index 62bf8d2f..7d3b8ab4 100755
--- a/checks/cloud/aws/sam/api_use_secure_tls_policy.go
+++ b/checks/cloud/aws/sam/api_use_secure_tls_policy.go
@@ -1,11 +1,11 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckApiUseSecureTlsPolicy = rules.Register(
diff --git a/checks/cloud/aws/sam/api_use_secure_tls_policy_test.go b/checks/cloud/aws/sam/api_use_secure_tls_policy_test.go
index d1a60093..5c11884e 100644
--- a/checks/cloud/aws/sam/api_use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/sam/api_use_secure_tls_policy_test.go
@@ -3,12 +3,12 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/enable_api_access_logging.go b/checks/cloud/aws/sam/enable_api_access_logging.go
index 4726aaac..ff9595ef 100755
--- a/checks/cloud/aws/sam/enable_api_access_logging.go
+++ b/checks/cloud/aws/sam/enable_api_access_logging.go
@@ -1,11 +1,11 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableApiAccessLogging = rules.Register(
diff --git a/checks/cloud/aws/sam/enable_api_access_logging_test.go b/checks/cloud/aws/sam/enable_api_access_logging_test.go
index 0b3a9e2e..827370c2 100644
--- a/checks/cloud/aws/sam/enable_api_access_logging_test.go
+++ b/checks/cloud/aws/sam/enable_api_access_logging_test.go
@@ -3,12 +3,12 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/enable_api_cache_encryption.go b/checks/cloud/aws/sam/enable_api_cache_encryption.go
index 3c29caf5..cc5e469a 100755
--- a/checks/cloud/aws/sam/enable_api_cache_encryption.go
+++ b/checks/cloud/aws/sam/enable_api_cache_encryption.go
@@ -1,11 +1,11 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableApiCacheEncryption = rules.Register(
diff --git a/checks/cloud/aws/sam/enable_api_cache_encryption_test.go b/checks/cloud/aws/sam/enable_api_cache_encryption_test.go
index ef3a830c..49ee1878 100644
--- a/checks/cloud/aws/sam/enable_api_cache_encryption_test.go
+++ b/checks/cloud/aws/sam/enable_api_cache_encryption_test.go
@@ -3,12 +3,12 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/enable_api_tracing.go b/checks/cloud/aws/sam/enable_api_tracing.go
index 3b1bec37..429a385d 100755
--- a/checks/cloud/aws/sam/enable_api_tracing.go
+++ b/checks/cloud/aws/sam/enable_api_tracing.go
@@ -1,11 +1,11 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableApiTracing = rules.Register(
diff --git a/checks/cloud/aws/sam/enable_api_tracing_test.go b/checks/cloud/aws/sam/enable_api_tracing_test.go
index 90fcf0ff..bd14476d 100644
--- a/checks/cloud/aws/sam/enable_api_tracing_test.go
+++ b/checks/cloud/aws/sam/enable_api_tracing_test.go
@@ -3,12 +3,12 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/enable_function_tracing.go b/checks/cloud/aws/sam/enable_function_tracing.go
index 496da316..e1cd9036 100755
--- a/checks/cloud/aws/sam/enable_function_tracing.go
+++ b/checks/cloud/aws/sam/enable_function_tracing.go
@@ -1,12 +1,12 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableFunctionTracing = rules.Register(
diff --git a/checks/cloud/aws/sam/enable_function_tracing_test.go b/checks/cloud/aws/sam/enable_function_tracing_test.go
index 28223c34..d5dba6ed 100644
--- a/checks/cloud/aws/sam/enable_function_tracing_test.go
+++ b/checks/cloud/aws/sam/enable_function_tracing_test.go
@@ -3,12 +3,12 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/enable_http_api_access_logging.go b/checks/cloud/aws/sam/enable_http_api_access_logging.go
index c12729e6..09d5c0e4 100755
--- a/checks/cloud/aws/sam/enable_http_api_access_logging.go
+++ b/checks/cloud/aws/sam/enable_http_api_access_logging.go
@@ -1,11 +1,11 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableHttpApiAccessLogging = rules.Register(
diff --git a/checks/cloud/aws/sam/enable_http_api_access_logging_test.go b/checks/cloud/aws/sam/enable_http_api_access_logging_test.go
index fc32f814..04010459 100644
--- a/checks/cloud/aws/sam/enable_http_api_access_logging_test.go
+++ b/checks/cloud/aws/sam/enable_http_api_access_logging_test.go
@@ -3,12 +3,12 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/enable_state_machine_logging.go b/checks/cloud/aws/sam/enable_state_machine_logging.go
index 2ea22038..661cf0ca 100644
--- a/checks/cloud/aws/sam/enable_state_machine_logging.go
+++ b/checks/cloud/aws/sam/enable_state_machine_logging.go
@@ -1,11 +1,11 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableStateMachineLogging = rules.Register(
diff --git a/checks/cloud/aws/sam/enable_state_machine_logging_test.go b/checks/cloud/aws/sam/enable_state_machine_logging_test.go
index 2f6884e3..d9591076 100644
--- a/checks/cloud/aws/sam/enable_state_machine_logging_test.go
+++ b/checks/cloud/aws/sam/enable_state_machine_logging_test.go
@@ -3,12 +3,12 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/enable_state_machine_tracing.go b/checks/cloud/aws/sam/enable_state_machine_tracing.go
index 274b4411..9af8730d 100755
--- a/checks/cloud/aws/sam/enable_state_machine_tracing.go
+++ b/checks/cloud/aws/sam/enable_state_machine_tracing.go
@@ -1,11 +1,11 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableStateMachineTracing = rules.Register(
diff --git a/checks/cloud/aws/sam/enable_state_machine_tracing_test.go b/checks/cloud/aws/sam/enable_state_machine_tracing_test.go
index 93bbe28f..5b1a91c3 100644
--- a/checks/cloud/aws/sam/enable_state_machine_tracing_test.go
+++ b/checks/cloud/aws/sam/enable_state_machine_tracing_test.go
@@ -3,12 +3,12 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/enable_table_encryption.go b/checks/cloud/aws/sam/enable_table_encryption.go
index 190ac83e..b9d06ca9 100755
--- a/checks/cloud/aws/sam/enable_table_encryption.go
+++ b/checks/cloud/aws/sam/enable_table_encryption.go
@@ -1,11 +1,11 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableTableEncryption = rules.Register(
diff --git a/checks/cloud/aws/sam/enable_table_encryption_test.go b/checks/cloud/aws/sam/enable_table_encryption_test.go
index 25e30b35..b070b705 100644
--- a/checks/cloud/aws/sam/enable_table_encryption_test.go
+++ b/checks/cloud/aws/sam/enable_table_encryption_test.go
@@ -3,12 +3,12 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sam/no_function_policy_wildcards.go b/checks/cloud/aws/sam/no_function_policy_wildcards.go
index 80584e7e..14eb17a4 100755
--- a/checks/cloud/aws/sam/no_function_policy_wildcards.go
+++ b/checks/cloud/aws/sam/no_function_policy_wildcards.go
@@ -3,16 +3,16 @@ package sam
 import (
 	"strings"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 
 	"github.com/liamg/iamgo"
 )
diff --git a/checks/cloud/aws/sam/no_function_policy_wildcards_test.go b/checks/cloud/aws/sam/no_function_policy_wildcards_test.go
index cb918f24..3c1197c2 100644
--- a/checks/cloud/aws/sam/no_function_policy_wildcards_test.go
+++ b/checks/cloud/aws/sam/no_function_policy_wildcards_test.go
@@ -3,13 +3,13 @@ package sam
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/liamg/iamgo"
 
diff --git a/checks/cloud/aws/sam/no_state_machine_policy_wildcards.go b/checks/cloud/aws/sam/no_state_machine_policy_wildcards.go
index e25d5cb7..5337ca24 100755
--- a/checks/cloud/aws/sam/no_state_machine_policy_wildcards.go
+++ b/checks/cloud/aws/sam/no_state_machine_policy_wildcards.go
@@ -1,11 +1,11 @@
 package sam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoStateMachinePolicyWildcards = rules.Register(
diff --git a/checks/cloud/aws/sam/no_state_machine_policy_wildcards_test.go b/checks/cloud/aws/sam/no_state_machine_policy_wildcards_test.go
index 6f75580c..e819f060 100644
--- a/checks/cloud/aws/sam/no_state_machine_policy_wildcards_test.go
+++ b/checks/cloud/aws/sam/no_state_machine_policy_wildcards_test.go
@@ -3,13 +3,13 @@ package sam
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/liamg/iamgo"
 
diff --git a/checks/cloud/aws/sns/enable_topic_encryption.go b/checks/cloud/aws/sns/enable_topic_encryption.go
index 95c058e1..d5399382 100755
--- a/checks/cloud/aws/sns/enable_topic_encryption.go
+++ b/checks/cloud/aws/sns/enable_topic_encryption.go
@@ -1,11 +1,11 @@
 package sns
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableTopicEncryption = rules.Register(
diff --git a/checks/cloud/aws/sns/enable_topic_encryption_test.go b/checks/cloud/aws/sns/enable_topic_encryption_test.go
index e2dea20e..bd064d4a 100644
--- a/checks/cloud/aws/sns/enable_topic_encryption_test.go
+++ b/checks/cloud/aws/sns/enable_topic_encryption_test.go
@@ -3,12 +3,12 @@ package sns
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sns"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sns"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sns/topic_encryption_with_cmk.go b/checks/cloud/aws/sns/topic_encryption_with_cmk.go
index 577646e4..9943be57 100755
--- a/checks/cloud/aws/sns/topic_encryption_with_cmk.go
+++ b/checks/cloud/aws/sns/topic_encryption_with_cmk.go
@@ -1,11 +1,11 @@
 package sns
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckTopicEncryptionUsesCMK = rules.Register(
diff --git a/checks/cloud/aws/sns/topic_encryption_with_cmk_test.go b/checks/cloud/aws/sns/topic_encryption_with_cmk_test.go
index 0d4504e7..15abd7d8 100644
--- a/checks/cloud/aws/sns/topic_encryption_with_cmk_test.go
+++ b/checks/cloud/aws/sns/topic_encryption_with_cmk_test.go
@@ -3,12 +3,12 @@ package sns
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sns"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sns"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sqs/enable_queue_encryption.go b/checks/cloud/aws/sqs/enable_queue_encryption.go
index ecaeb57c..a3cd4ab1 100755
--- a/checks/cloud/aws/sqs/enable_queue_encryption.go
+++ b/checks/cloud/aws/sqs/enable_queue_encryption.go
@@ -1,11 +1,11 @@
 package sqs
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableQueueEncryption = rules.Register(
diff --git a/checks/cloud/aws/sqs/enable_queue_encryption_test.go b/checks/cloud/aws/sqs/enable_queue_encryption_test.go
index e3c0ecdb..a749926d 100644
--- a/checks/cloud/aws/sqs/enable_queue_encryption_test.go
+++ b/checks/cloud/aws/sqs/enable_queue_encryption_test.go
@@ -3,12 +3,12 @@ package sqs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sqs"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sqs"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/sqs/no_wildcards_in_policy_documents.go b/checks/cloud/aws/sqs/no_wildcards_in_policy_documents.go
index 2d1e3a02..d2e13023 100755
--- a/checks/cloud/aws/sqs/no_wildcards_in_policy_documents.go
+++ b/checks/cloud/aws/sqs/no_wildcards_in_policy_documents.go
@@ -3,15 +3,15 @@ package sqs
 import (
 	"strings"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 
 	"github.com/liamg/iamgo"
 )
diff --git a/checks/cloud/aws/sqs/no_wildcards_in_policy_documents_test.go b/checks/cloud/aws/sqs/no_wildcards_in_policy_documents_test.go
index 5d771a0e..649c5c7b 100644
--- a/checks/cloud/aws/sqs/no_wildcards_in_policy_documents_test.go
+++ b/checks/cloud/aws/sqs/no_wildcards_in_policy_documents_test.go
@@ -3,13 +3,13 @@ package sqs
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sqs"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sqs"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/liamg/iamgo"
 
diff --git a/checks/cloud/aws/sqs/queue_encryption_with_cmk.go b/checks/cloud/aws/sqs/queue_encryption_with_cmk.go
index bb476e4a..aca5672a 100755
--- a/checks/cloud/aws/sqs/queue_encryption_with_cmk.go
+++ b/checks/cloud/aws/sqs/queue_encryption_with_cmk.go
@@ -1,11 +1,11 @@
 package sqs
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckQueueEncryptionUsesCMK = rules.Register(
diff --git a/checks/cloud/aws/sqs/queue_encryption_with_cmk_test.go b/checks/cloud/aws/sqs/queue_encryption_with_cmk_test.go
index 8ba6953e..4c82119c 100644
--- a/checks/cloud/aws/sqs/queue_encryption_with_cmk_test.go
+++ b/checks/cloud/aws/sqs/queue_encryption_with_cmk_test.go
@@ -3,12 +3,12 @@ package sqs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/sqs"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/sqs"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/ssm/avoid_leaks_via_http.go b/checks/cloud/aws/ssm/avoid_leaks_via_http.go
index bcf3d160..2fb0746b 100644
--- a/checks/cloud/aws/ssm/avoid_leaks_via_http.go
+++ b/checks/cloud/aws/ssm/avoid_leaks_via_http.go
@@ -1,11 +1,11 @@
 package ssm
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/terraform"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/terraform"
 )
 
 var AvoidLeaksViaHTTP = rules.Register(
diff --git a/checks/cloud/aws/ssm/secret_use_customer_key.go b/checks/cloud/aws/ssm/secret_use_customer_key.go
index 223054ba..4cc1ae9d 100755
--- a/checks/cloud/aws/ssm/secret_use_customer_key.go
+++ b/checks/cloud/aws/ssm/secret_use_customer_key.go
@@ -1,12 +1,12 @@
 package ssm
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ssm"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ssm"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckSecretUseCustomerKey = rules.Register(
diff --git a/checks/cloud/aws/ssm/secret_use_customer_key_test.go b/checks/cloud/aws/ssm/secret_use_customer_key_test.go
index c90543f4..add2e4a6 100644
--- a/checks/cloud/aws/ssm/secret_use_customer_key_test.go
+++ b/checks/cloud/aws/ssm/secret_use_customer_key_test.go
@@ -3,12 +3,12 @@ package ssm
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/ssm"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ssm"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/aws/workspaces/enable_disk_encryption.go b/checks/cloud/aws/workspaces/enable_disk_encryption.go
index 86d4fc24..6e002a13 100755
--- a/checks/cloud/aws/workspaces/enable_disk_encryption.go
+++ b/checks/cloud/aws/workspaces/enable_disk_encryption.go
@@ -1,11 +1,11 @@
 package workspaces
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableDiskEncryption = rules.Register(
diff --git a/checks/cloud/aws/workspaces/enable_disk_encryption_test.go b/checks/cloud/aws/workspaces/enable_disk_encryption_test.go
index 8ba7f31b..41f7cce5 100644
--- a/checks/cloud/aws/workspaces/enable_disk_encryption_test.go
+++ b/checks/cloud/aws/workspaces/enable_disk_encryption_test.go
@@ -3,12 +3,12 @@ package workspaces
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/aws/workspaces"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/workspaces"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/appservice/account_identity_registered.go b/checks/cloud/azure/appservice/account_identity_registered.go
index 70503dbf..26697514 100755
--- a/checks/cloud/azure/appservice/account_identity_registered.go
+++ b/checks/cloud/azure/appservice/account_identity_registered.go
@@ -1,11 +1,11 @@
 package appservice
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAccountIdentityRegistered = rules.Register(
diff --git a/checks/cloud/azure/appservice/account_identity_registered_test.go b/checks/cloud/azure/appservice/account_identity_registered_test.go
index dfa09b26..a3797921 100644
--- a/checks/cloud/azure/appservice/account_identity_registered_test.go
+++ b/checks/cloud/azure/appservice/account_identity_registered_test.go
@@ -3,12 +3,12 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/appservice"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/appservice"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/appservice/authentication_enabled.go b/checks/cloud/azure/appservice/authentication_enabled.go
index 60b1467a..6c55bd1d 100755
--- a/checks/cloud/azure/appservice/authentication_enabled.go
+++ b/checks/cloud/azure/appservice/authentication_enabled.go
@@ -1,11 +1,11 @@
 package appservice
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAuthenticationEnabled = rules.Register(
diff --git a/checks/cloud/azure/appservice/authentication_enabled_test.go b/checks/cloud/azure/appservice/authentication_enabled_test.go
index 721861d1..6da9264d 100644
--- a/checks/cloud/azure/appservice/authentication_enabled_test.go
+++ b/checks/cloud/azure/appservice/authentication_enabled_test.go
@@ -3,12 +3,12 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/appservice"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/appservice"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/appservice/enable_http2.go b/checks/cloud/azure/appservice/enable_http2.go
index d8abacd3..53a3cfd4 100755
--- a/checks/cloud/azure/appservice/enable_http2.go
+++ b/checks/cloud/azure/appservice/enable_http2.go
@@ -1,11 +1,11 @@
 package appservice
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableHttp2 = rules.Register(
diff --git a/checks/cloud/azure/appservice/enable_http2_test.go b/checks/cloud/azure/appservice/enable_http2_test.go
index 84d9e580..ca55660b 100644
--- a/checks/cloud/azure/appservice/enable_http2_test.go
+++ b/checks/cloud/azure/appservice/enable_http2_test.go
@@ -3,12 +3,12 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/appservice"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/appservice"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/appservice/enforce_https.go b/checks/cloud/azure/appservice/enforce_https.go
index 09f46b4b..1877cda0 100755
--- a/checks/cloud/azure/appservice/enforce_https.go
+++ b/checks/cloud/azure/appservice/enforce_https.go
@@ -1,11 +1,11 @@
 package appservice
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnforceHttps = rules.Register(
diff --git a/checks/cloud/azure/appservice/enforce_https_test.go b/checks/cloud/azure/appservice/enforce_https_test.go
index a6d386ee..1e489a92 100644
--- a/checks/cloud/azure/appservice/enforce_https_test.go
+++ b/checks/cloud/azure/appservice/enforce_https_test.go
@@ -3,12 +3,12 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/appservice"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/appservice"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/appservice/require_client_cert.go b/checks/cloud/azure/appservice/require_client_cert.go
index 93bca5fb..ac036d5f 100755
--- a/checks/cloud/azure/appservice/require_client_cert.go
+++ b/checks/cloud/azure/appservice/require_client_cert.go
@@ -1,11 +1,11 @@
 package appservice
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRequireClientCert = rules.Register(
diff --git a/checks/cloud/azure/appservice/require_client_cert_test.go b/checks/cloud/azure/appservice/require_client_cert_test.go
index 22e1fb4b..f925c2c9 100644
--- a/checks/cloud/azure/appservice/require_client_cert_test.go
+++ b/checks/cloud/azure/appservice/require_client_cert_test.go
@@ -3,12 +3,12 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/appservice"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/appservice"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/appservice/use_secure_tls_policy.go b/checks/cloud/azure/appservice/use_secure_tls_policy.go
index d028e101..15c30839 100755
--- a/checks/cloud/azure/appservice/use_secure_tls_policy.go
+++ b/checks/cloud/azure/appservice/use_secure_tls_policy.go
@@ -1,11 +1,11 @@
 package appservice
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseSecureTlsPolicy = rules.Register(
diff --git a/checks/cloud/azure/appservice/use_secure_tls_policy_test.go b/checks/cloud/azure/appservice/use_secure_tls_policy_test.go
index 2240ce70..5d457f08 100644
--- a/checks/cloud/azure/appservice/use_secure_tls_policy_test.go
+++ b/checks/cloud/azure/appservice/use_secure_tls_policy_test.go
@@ -3,12 +3,12 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/appservice"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/appservice"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/authorization/limit_role_actions.go b/checks/cloud/azure/authorization/limit_role_actions.go
index 9a7fe457..2f5b9848 100755
--- a/checks/cloud/azure/authorization/limit_role_actions.go
+++ b/checks/cloud/azure/authorization/limit_role_actions.go
@@ -1,11 +1,11 @@
 package authorization
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckLimitRoleActions = rules.Register(
diff --git a/checks/cloud/azure/authorization/limit_role_actions_test.go b/checks/cloud/azure/authorization/limit_role_actions_test.go
index 4d92af78..4e6251f1 100644
--- a/checks/cloud/azure/authorization/limit_role_actions_test.go
+++ b/checks/cloud/azure/authorization/limit_role_actions_test.go
@@ -3,12 +3,12 @@ package authorization
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/authorization"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/authorization"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/compute/disable_password_authentication.go b/checks/cloud/azure/compute/disable_password_authentication.go
index d2392c3b..8e3b7268 100755
--- a/checks/cloud/azure/compute/disable_password_authentication.go
+++ b/checks/cloud/azure/compute/disable_password_authentication.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckDisablePasswordAuthentication = rules.Register(
diff --git a/checks/cloud/azure/compute/disable_password_authentication_test.go b/checks/cloud/azure/compute/disable_password_authentication_test.go
index fa075c55..0a9d9581 100644
--- a/checks/cloud/azure/compute/disable_password_authentication_test.go
+++ b/checks/cloud/azure/compute/disable_password_authentication_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/compute/enable_disk_encryption.go b/checks/cloud/azure/compute/enable_disk_encryption.go
index ab2720b4..e3b67554 100755
--- a/checks/cloud/azure/compute/enable_disk_encryption.go
+++ b/checks/cloud/azure/compute/enable_disk_encryption.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableDiskEncryption = rules.Register(
diff --git a/checks/cloud/azure/compute/enable_disk_encryption_test.go b/checks/cloud/azure/compute/enable_disk_encryption_test.go
index 2efd502f..8152f642 100644
--- a/checks/cloud/azure/compute/enable_disk_encryption_test.go
+++ b/checks/cloud/azure/compute/enable_disk_encryption_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/compute/no_secrets_in_custom_data.go b/checks/cloud/azure/compute/no_secrets_in_custom_data.go
index 0d6d2087..33673558 100755
--- a/checks/cloud/azure/compute/no_secrets_in_custom_data.go
+++ b/checks/cloud/azure/compute/no_secrets_in_custom_data.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/owenrumney/squealer/pkg/squealer"
 )
 
diff --git a/checks/cloud/azure/compute/no_secrets_in_custom_data_test.go b/checks/cloud/azure/compute/no_secrets_in_custom_data_test.go
index 16c59a84..90c8c4ec 100644
--- a/checks/cloud/azure/compute/no_secrets_in_custom_data_test.go
+++ b/checks/cloud/azure/compute/no_secrets_in_custom_data_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/container/configured_network_policy.go b/checks/cloud/azure/container/configured_network_policy.go
index 9469f4a8..71657e10 100755
--- a/checks/cloud/azure/container/configured_network_policy.go
+++ b/checks/cloud/azure/container/configured_network_policy.go
@@ -1,11 +1,11 @@
 package container
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckConfiguredNetworkPolicy = rules.Register(
diff --git a/checks/cloud/azure/container/configured_network_policy_test.go b/checks/cloud/azure/container/configured_network_policy_test.go
index a7b97955..ad117c33 100644
--- a/checks/cloud/azure/container/configured_network_policy_test.go
+++ b/checks/cloud/azure/container/configured_network_policy_test.go
@@ -3,12 +3,12 @@ package container
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/container"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/container"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/container/limit_authorized_ips.go b/checks/cloud/azure/container/limit_authorized_ips.go
index 198e1931..986273ea 100755
--- a/checks/cloud/azure/container/limit_authorized_ips.go
+++ b/checks/cloud/azure/container/limit_authorized_ips.go
@@ -1,11 +1,11 @@
 package container
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckLimitAuthorizedIps = rules.Register(
diff --git a/checks/cloud/azure/container/limit_authorized_ips_test.go b/checks/cloud/azure/container/limit_authorized_ips_test.go
index bb4a643b..9b5c0867 100644
--- a/checks/cloud/azure/container/limit_authorized_ips_test.go
+++ b/checks/cloud/azure/container/limit_authorized_ips_test.go
@@ -3,12 +3,12 @@ package container
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/container"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/container"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/container/logging.go b/checks/cloud/azure/container/logging.go
index 2e389f50..639834f7 100755
--- a/checks/cloud/azure/container/logging.go
+++ b/checks/cloud/azure/container/logging.go
@@ -1,11 +1,11 @@
 package container
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckLogging = rules.Register(
diff --git a/checks/cloud/azure/container/logging_test.go b/checks/cloud/azure/container/logging_test.go
index 1eb0d6f6..0a477a7d 100644
--- a/checks/cloud/azure/container/logging_test.go
+++ b/checks/cloud/azure/container/logging_test.go
@@ -3,12 +3,12 @@ package container
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/container"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/container"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/container/use_rbac_permissions.go b/checks/cloud/azure/container/use_rbac_permissions.go
index 394c21f2..d736e799 100755
--- a/checks/cloud/azure/container/use_rbac_permissions.go
+++ b/checks/cloud/azure/container/use_rbac_permissions.go
@@ -1,11 +1,11 @@
 package container
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseRbacPermissions = rules.Register(
diff --git a/checks/cloud/azure/container/use_rbac_permissions_test.go b/checks/cloud/azure/container/use_rbac_permissions_test.go
index ec07c9b2..bcf0b83d 100644
--- a/checks/cloud/azure/container/use_rbac_permissions_test.go
+++ b/checks/cloud/azure/container/use_rbac_permissions_test.go
@@ -3,12 +3,12 @@ package container
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/container"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/container"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/all_threat_alerts_enabled.go b/checks/cloud/azure/database/all_threat_alerts_enabled.go
index 366a34a3..e3ec1576 100755
--- a/checks/cloud/azure/database/all_threat_alerts_enabled.go
+++ b/checks/cloud/azure/database/all_threat_alerts_enabled.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAllThreatAlertsEnabled = rules.Register(
diff --git a/checks/cloud/azure/database/all_threat_alerts_enabled_test.go b/checks/cloud/azure/database/all_threat_alerts_enabled_test.go
index f3e71a70..68622e7f 100644
--- a/checks/cloud/azure/database/all_threat_alerts_enabled_test.go
+++ b/checks/cloud/azure/database/all_threat_alerts_enabled_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/enable_audit.go b/checks/cloud/azure/database/enable_audit.go
index f6c052e7..64141120 100755
--- a/checks/cloud/azure/database/enable_audit.go
+++ b/checks/cloud/azure/database/enable_audit.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAudit = rules.Register(
diff --git a/checks/cloud/azure/database/enable_audit_test.go b/checks/cloud/azure/database/enable_audit_test.go
index 995ae33c..6848f90d 100644
--- a/checks/cloud/azure/database/enable_audit_test.go
+++ b/checks/cloud/azure/database/enable_audit_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/enable_ssl_enforcement.go b/checks/cloud/azure/database/enable_ssl_enforcement.go
index 3228cdf2..86b2c447 100755
--- a/checks/cloud/azure/database/enable_ssl_enforcement.go
+++ b/checks/cloud/azure/database/enable_ssl_enforcement.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableSslEnforcement = rules.Register(
diff --git a/checks/cloud/azure/database/enable_ssl_enforcement_test.go b/checks/cloud/azure/database/enable_ssl_enforcement_test.go
index fd51f88d..fc62a661 100644
--- a/checks/cloud/azure/database/enable_ssl_enforcement_test.go
+++ b/checks/cloud/azure/database/enable_ssl_enforcement_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/no_public_access.go b/checks/cloud/azure/database/no_public_access.go
index 8d94806a..bee6da5e 100755
--- a/checks/cloud/azure/database/no_public_access.go
+++ b/checks/cloud/azure/database/no_public_access.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/azure/database/no_public_access_test.go b/checks/cloud/azure/database/no_public_access_test.go
index 1da90eee..188d85b1 100644
--- a/checks/cloud/azure/database/no_public_access_test.go
+++ b/checks/cloud/azure/database/no_public_access_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/no_public_firewall_access.go b/checks/cloud/azure/database/no_public_firewall_access.go
index 6de26652..a67301d3 100755
--- a/checks/cloud/azure/database/no_public_firewall_access.go
+++ b/checks/cloud/azure/database/no_public_firewall_access.go
@@ -1,13 +1,13 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicFirewallAccess = rules.Register(
diff --git a/checks/cloud/azure/database/no_public_firewall_access_test.go b/checks/cloud/azure/database/no_public_firewall_access_test.go
index c398ffda..5e27b571 100644
--- a/checks/cloud/azure/database/no_public_firewall_access_test.go
+++ b/checks/cloud/azure/database/no_public_firewall_access_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/postgres_configuration_connection_throttling.go b/checks/cloud/azure/database/postgres_configuration_connection_throttling.go
index cab17c81..7496a2cf 100755
--- a/checks/cloud/azure/database/postgres_configuration_connection_throttling.go
+++ b/checks/cloud/azure/database/postgres_configuration_connection_throttling.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPostgresConfigurationLogConnectionThrottling = rules.Register(
diff --git a/checks/cloud/azure/database/postgres_configuration_connection_throttling_test.go b/checks/cloud/azure/database/postgres_configuration_connection_throttling_test.go
index 3ec42ddd..0d3755f8 100644
--- a/checks/cloud/azure/database/postgres_configuration_connection_throttling_test.go
+++ b/checks/cloud/azure/database/postgres_configuration_connection_throttling_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/postgres_configuration_log_checkpoints.go b/checks/cloud/azure/database/postgres_configuration_log_checkpoints.go
index 3b590f97..0bbc9828 100755
--- a/checks/cloud/azure/database/postgres_configuration_log_checkpoints.go
+++ b/checks/cloud/azure/database/postgres_configuration_log_checkpoints.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPostgresConfigurationLogCheckpoints = rules.Register(
diff --git a/checks/cloud/azure/database/postgres_configuration_log_checkpoints_test.go b/checks/cloud/azure/database/postgres_configuration_log_checkpoints_test.go
index 9f12108e..f1ab7cfd 100644
--- a/checks/cloud/azure/database/postgres_configuration_log_checkpoints_test.go
+++ b/checks/cloud/azure/database/postgres_configuration_log_checkpoints_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/postgres_configuration_log_connections.go b/checks/cloud/azure/database/postgres_configuration_log_connections.go
index 5553c3d2..0e4a898f 100755
--- a/checks/cloud/azure/database/postgres_configuration_log_connections.go
+++ b/checks/cloud/azure/database/postgres_configuration_log_connections.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPostgresConfigurationLogConnections = rules.Register(
diff --git a/checks/cloud/azure/database/postgres_configuration_log_connections_test.go b/checks/cloud/azure/database/postgres_configuration_log_connections_test.go
index 560eac6e..0b2ed105 100644
--- a/checks/cloud/azure/database/postgres_configuration_log_connections_test.go
+++ b/checks/cloud/azure/database/postgres_configuration_log_connections_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/retention_period_set.go b/checks/cloud/azure/database/retention_period_set.go
index 27ee22ea..fd084572 100755
--- a/checks/cloud/azure/database/retention_period_set.go
+++ b/checks/cloud/azure/database/retention_period_set.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRetentionPeriodSet = rules.Register(
diff --git a/checks/cloud/azure/database/retention_period_set_test.go b/checks/cloud/azure/database/retention_period_set_test.go
index 24c6d094..d9ef3c04 100644
--- a/checks/cloud/azure/database/retention_period_set_test.go
+++ b/checks/cloud/azure/database/retention_period_set_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/secure_tls_policy.go b/checks/cloud/azure/database/secure_tls_policy.go
index c4315b11..af63d069 100755
--- a/checks/cloud/azure/database/secure_tls_policy.go
+++ b/checks/cloud/azure/database/secure_tls_policy.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckSecureTlsPolicy = rules.Register(
diff --git a/checks/cloud/azure/database/secure_tls_policy_test.go b/checks/cloud/azure/database/secure_tls_policy_test.go
index 7c96b85b..3043145b 100644
--- a/checks/cloud/azure/database/secure_tls_policy_test.go
+++ b/checks/cloud/azure/database/secure_tls_policy_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/threat_alert_email_set.go b/checks/cloud/azure/database/threat_alert_email_set.go
index 96f47d12..fad51093 100755
--- a/checks/cloud/azure/database/threat_alert_email_set.go
+++ b/checks/cloud/azure/database/threat_alert_email_set.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckThreatAlertEmailSet = rules.Register(
diff --git a/checks/cloud/azure/database/threat_alert_email_set_test.go b/checks/cloud/azure/database/threat_alert_email_set_test.go
index f5adb599..ef5cc38b 100644
--- a/checks/cloud/azure/database/threat_alert_email_set_test.go
+++ b/checks/cloud/azure/database/threat_alert_email_set_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/database/threat_alert_email_to_owner.go b/checks/cloud/azure/database/threat_alert_email_to_owner.go
index 5cb9f4bb..06cc7165 100755
--- a/checks/cloud/azure/database/threat_alert_email_to_owner.go
+++ b/checks/cloud/azure/database/threat_alert_email_to_owner.go
@@ -1,11 +1,11 @@
 package database
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckThreatAlertEmailToOwner = rules.Register(
diff --git a/checks/cloud/azure/database/threat_alert_email_to_owner_test.go b/checks/cloud/azure/database/threat_alert_email_to_owner_test.go
index 0ff23279..ddfe619b 100644
--- a/checks/cloud/azure/database/threat_alert_email_to_owner_test.go
+++ b/checks/cloud/azure/database/threat_alert_email_to_owner_test.go
@@ -3,12 +3,12 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/database"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/datafactory/no_public_access.go b/checks/cloud/azure/datafactory/no_public_access.go
index 2fdb7c71..a7709ea3 100755
--- a/checks/cloud/azure/datafactory/no_public_access.go
+++ b/checks/cloud/azure/datafactory/no_public_access.go
@@ -1,11 +1,11 @@
 package datafactory
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/azure/datafactory/no_public_access_test.go b/checks/cloud/azure/datafactory/no_public_access_test.go
index fe5058a1..37e294e2 100644
--- a/checks/cloud/azure/datafactory/no_public_access_test.go
+++ b/checks/cloud/azure/datafactory/no_public_access_test.go
@@ -3,12 +3,12 @@ package datafactory
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/datafactory"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/datafactory"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/datalake/enable_at_rest_encryption.go b/checks/cloud/azure/datalake/enable_at_rest_encryption.go
index 90c30f37..b57bc39e 100755
--- a/checks/cloud/azure/datalake/enable_at_rest_encryption.go
+++ b/checks/cloud/azure/datalake/enable_at_rest_encryption.go
@@ -1,11 +1,11 @@
 package datalake
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAtRestEncryption = rules.Register(
diff --git a/checks/cloud/azure/datalake/enable_at_rest_encryption_test.go b/checks/cloud/azure/datalake/enable_at_rest_encryption_test.go
index 139e487d..5ca3370e 100644
--- a/checks/cloud/azure/datalake/enable_at_rest_encryption_test.go
+++ b/checks/cloud/azure/datalake/enable_at_rest_encryption_test.go
@@ -3,12 +3,12 @@ package datalake
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/datalake"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/datalake"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/keyvault/content_type_for_secret.go b/checks/cloud/azure/keyvault/content_type_for_secret.go
index 8c6f6985..6b3965dd 100755
--- a/checks/cloud/azure/keyvault/content_type_for_secret.go
+++ b/checks/cloud/azure/keyvault/content_type_for_secret.go
@@ -1,11 +1,11 @@
 package keyvault
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckContentTypeForSecret = rules.Register(
diff --git a/checks/cloud/azure/keyvault/content_type_for_secret_test.go b/checks/cloud/azure/keyvault/content_type_for_secret_test.go
index 1b69d997..bd0d6f22 100644
--- a/checks/cloud/azure/keyvault/content_type_for_secret_test.go
+++ b/checks/cloud/azure/keyvault/content_type_for_secret_test.go
@@ -3,12 +3,12 @@ package keyvault
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/keyvault"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/keyvault"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/keyvault/ensure_key_expiry.go b/checks/cloud/azure/keyvault/ensure_key_expiry.go
index 321a0db2..ad6b71a9 100755
--- a/checks/cloud/azure/keyvault/ensure_key_expiry.go
+++ b/checks/cloud/azure/keyvault/ensure_key_expiry.go
@@ -1,11 +1,11 @@
 package keyvault
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnsureKeyExpiry = rules.Register(
diff --git a/checks/cloud/azure/keyvault/ensure_key_expiry_test.go b/checks/cloud/azure/keyvault/ensure_key_expiry_test.go
index cac6a32b..61161fb3 100644
--- a/checks/cloud/azure/keyvault/ensure_key_expiry_test.go
+++ b/checks/cloud/azure/keyvault/ensure_key_expiry_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/keyvault"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/keyvault"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/keyvault/ensure_secret_expiry.go b/checks/cloud/azure/keyvault/ensure_secret_expiry.go
index 4db7cf03..7bd2101e 100755
--- a/checks/cloud/azure/keyvault/ensure_secret_expiry.go
+++ b/checks/cloud/azure/keyvault/ensure_secret_expiry.go
@@ -1,11 +1,11 @@
 package keyvault
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnsureSecretExpiry = rules.Register(
diff --git a/checks/cloud/azure/keyvault/ensure_secret_expiry_test.go b/checks/cloud/azure/keyvault/ensure_secret_expiry_test.go
index 4e4bc304..3d77e4b3 100644
--- a/checks/cloud/azure/keyvault/ensure_secret_expiry_test.go
+++ b/checks/cloud/azure/keyvault/ensure_secret_expiry_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/keyvault"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/keyvault"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/keyvault/no_purge.go b/checks/cloud/azure/keyvault/no_purge.go
index 2e44e0b4..b4367613 100755
--- a/checks/cloud/azure/keyvault/no_purge.go
+++ b/checks/cloud/azure/keyvault/no_purge.go
@@ -1,11 +1,11 @@
 package keyvault
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPurge = rules.Register(
diff --git a/checks/cloud/azure/keyvault/no_purge_test.go b/checks/cloud/azure/keyvault/no_purge_test.go
index e4b86aa9..6d411ccd 100644
--- a/checks/cloud/azure/keyvault/no_purge_test.go
+++ b/checks/cloud/azure/keyvault/no_purge_test.go
@@ -3,12 +3,12 @@ package keyvault
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/keyvault"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/keyvault"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/keyvault/specify_network_acl.go b/checks/cloud/azure/keyvault/specify_network_acl.go
index 2633379e..8eb941c3 100755
--- a/checks/cloud/azure/keyvault/specify_network_acl.go
+++ b/checks/cloud/azure/keyvault/specify_network_acl.go
@@ -1,11 +1,11 @@
 package keyvault
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckSpecifyNetworkAcl = rules.Register(
diff --git a/checks/cloud/azure/keyvault/specify_network_acl_test.go b/checks/cloud/azure/keyvault/specify_network_acl_test.go
index c0be7b87..6fd0467c 100644
--- a/checks/cloud/azure/keyvault/specify_network_acl_test.go
+++ b/checks/cloud/azure/keyvault/specify_network_acl_test.go
@@ -3,12 +3,12 @@ package keyvault
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/keyvault"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/keyvault"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/monitor/activity_log_retention_set.go b/checks/cloud/azure/monitor/activity_log_retention_set.go
index 95e3990b..f30f7277 100755
--- a/checks/cloud/azure/monitor/activity_log_retention_set.go
+++ b/checks/cloud/azure/monitor/activity_log_retention_set.go
@@ -1,11 +1,11 @@
 package monitor
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckActivityLogRetentionSet = rules.Register(
diff --git a/checks/cloud/azure/monitor/activity_log_retention_set_test.go b/checks/cloud/azure/monitor/activity_log_retention_set_test.go
index 98d32b52..5031a273 100644
--- a/checks/cloud/azure/monitor/activity_log_retention_set_test.go
+++ b/checks/cloud/azure/monitor/activity_log_retention_set_test.go
@@ -3,12 +3,12 @@ package monitor
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/monitor"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/monitor"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/monitor/capture_all_activities.go b/checks/cloud/azure/monitor/capture_all_activities.go
index 57318a4b..c75c4479 100755
--- a/checks/cloud/azure/monitor/capture_all_activities.go
+++ b/checks/cloud/azure/monitor/capture_all_activities.go
@@ -3,16 +3,16 @@ package monitor
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/azure/monitor"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/monitor"
 )
 
 var CheckCaptureAllActivities = rules.Register(
diff --git a/checks/cloud/azure/monitor/capture_all_activities_test.go b/checks/cloud/azure/monitor/capture_all_activities_test.go
index 49bf9764..464f071c 100644
--- a/checks/cloud/azure/monitor/capture_all_activities_test.go
+++ b/checks/cloud/azure/monitor/capture_all_activities_test.go
@@ -3,12 +3,12 @@ package monitor
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/monitor"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/monitor"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/monitor/capture_all_regions.go b/checks/cloud/azure/monitor/capture_all_regions.go
index 56a4d14b..99aeb91a 100755
--- a/checks/cloud/azure/monitor/capture_all_regions.go
+++ b/checks/cloud/azure/monitor/capture_all_regions.go
@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/azure/monitor"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/monitor"
 )
 
 var CheckCaptureAllRegions = rules.Register(
diff --git a/checks/cloud/azure/monitor/capture_all_regions_test.go b/checks/cloud/azure/monitor/capture_all_regions_test.go
index 12e9a38d..2efa7e7f 100644
--- a/checks/cloud/azure/monitor/capture_all_regions_test.go
+++ b/checks/cloud/azure/monitor/capture_all_regions_test.go
@@ -3,12 +3,12 @@ package monitor
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/monitor"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/monitor"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/network/disable_rdp_from_internet.go b/checks/cloud/azure/network/disable_rdp_from_internet.go
index aa397293..4b8669f2 100755
--- a/checks/cloud/azure/network/disable_rdp_from_internet.go
+++ b/checks/cloud/azure/network/disable_rdp_from_internet.go
@@ -1,13 +1,13 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var CheckDisableRdpFromInternet = rules.Register(
diff --git a/checks/cloud/azure/network/disable_rdp_from_internet_test.go b/checks/cloud/azure/network/disable_rdp_from_internet_test.go
index f8af2d4e..7a086e90 100644
--- a/checks/cloud/azure/network/disable_rdp_from_internet_test.go
+++ b/checks/cloud/azure/network/disable_rdp_from_internet_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/network"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/network"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/network/no_public_egress.go b/checks/cloud/azure/network/no_public_egress.go
index a4e7a895..09483381 100755
--- a/checks/cloud/azure/network/no_public_egress.go
+++ b/checks/cloud/azure/network/no_public_egress.go
@@ -1,12 +1,12 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicEgress = rules.Register(
diff --git a/checks/cloud/azure/network/no_public_egress_test.go b/checks/cloud/azure/network/no_public_egress_test.go
index aaab076a..34170367 100644
--- a/checks/cloud/azure/network/no_public_egress_test.go
+++ b/checks/cloud/azure/network/no_public_egress_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/network"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/network"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/network/no_public_ingress.go b/checks/cloud/azure/network/no_public_ingress.go
index 901bb8b6..e94cd372 100755
--- a/checks/cloud/azure/network/no_public_ingress.go
+++ b/checks/cloud/azure/network/no_public_ingress.go
@@ -1,12 +1,12 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngress = rules.Register(
diff --git a/checks/cloud/azure/network/no_public_ingress_test.go b/checks/cloud/azure/network/no_public_ingress_test.go
index 35b2f8c6..f5d4c0cc 100644
--- a/checks/cloud/azure/network/no_public_ingress_test.go
+++ b/checks/cloud/azure/network/no_public_ingress_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/network"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/network"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/network/retention_policy_set.go b/checks/cloud/azure/network/retention_policy_set.go
index fb0abfad..10456afc 100755
--- a/checks/cloud/azure/network/retention_policy_set.go
+++ b/checks/cloud/azure/network/retention_policy_set.go
@@ -1,11 +1,11 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRetentionPolicySet = rules.Register(
diff --git a/checks/cloud/azure/network/retention_policy_set_test.go b/checks/cloud/azure/network/retention_policy_set_test.go
index dd3a456a..6646cafe 100644
--- a/checks/cloud/azure/network/retention_policy_set_test.go
+++ b/checks/cloud/azure/network/retention_policy_set_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/network"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/network"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/network/ssh_blocked_from_internet.go b/checks/cloud/azure/network/ssh_blocked_from_internet.go
index d21ff2b9..596d997f 100755
--- a/checks/cloud/azure/network/ssh_blocked_from_internet.go
+++ b/checks/cloud/azure/network/ssh_blocked_from_internet.go
@@ -1,13 +1,13 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var CheckSshBlockedFromInternet = rules.Register(
diff --git a/checks/cloud/azure/network/ssh_blocked_from_internet_test.go b/checks/cloud/azure/network/ssh_blocked_from_internet_test.go
index 5b68dc18..d83f8e09 100644
--- a/checks/cloud/azure/network/ssh_blocked_from_internet_test.go
+++ b/checks/cloud/azure/network/ssh_blocked_from_internet_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/network"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/network"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/securitycenter/alert_on_severe_notifications.go b/checks/cloud/azure/securitycenter/alert_on_severe_notifications.go
index 4daaac5a..18499a64 100755
--- a/checks/cloud/azure/securitycenter/alert_on_severe_notifications.go
+++ b/checks/cloud/azure/securitycenter/alert_on_severe_notifications.go
@@ -1,11 +1,11 @@
 package securitycenter
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAlertOnSevereNotifications = rules.Register(
diff --git a/checks/cloud/azure/securitycenter/alert_on_severe_notifications_test.go b/checks/cloud/azure/securitycenter/alert_on_severe_notifications_test.go
index 1415aebf..158a6d1c 100644
--- a/checks/cloud/azure/securitycenter/alert_on_severe_notifications_test.go
+++ b/checks/cloud/azure/securitycenter/alert_on_severe_notifications_test.go
@@ -3,12 +3,12 @@ package securitycenter
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/securitycenter"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/securitycenter"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/securitycenter/enable_standard_subscription.go b/checks/cloud/azure/securitycenter/enable_standard_subscription.go
index 2feaff4a..2f416c33 100755
--- a/checks/cloud/azure/securitycenter/enable_standard_subscription.go
+++ b/checks/cloud/azure/securitycenter/enable_standard_subscription.go
@@ -1,12 +1,12 @@
 package securitycenter
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/azure/securitycenter"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/securitycenter"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableStandardSubscription = rules.Register(
diff --git a/checks/cloud/azure/securitycenter/enable_standard_subscription_test.go b/checks/cloud/azure/securitycenter/enable_standard_subscription_test.go
index 51417699..5e430aa3 100644
--- a/checks/cloud/azure/securitycenter/enable_standard_subscription_test.go
+++ b/checks/cloud/azure/securitycenter/enable_standard_subscription_test.go
@@ -3,12 +3,12 @@ package securitycenter
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/securitycenter"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/securitycenter"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/securitycenter/set_required_contact_details.go b/checks/cloud/azure/securitycenter/set_required_contact_details.go
index 2d55bb6b..8a626189 100755
--- a/checks/cloud/azure/securitycenter/set_required_contact_details.go
+++ b/checks/cloud/azure/securitycenter/set_required_contact_details.go
@@ -1,11 +1,11 @@
 package securitycenter
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckSetRequiredContactDetails = rules.Register(
diff --git a/checks/cloud/azure/securitycenter/set_required_contact_details_test.go b/checks/cloud/azure/securitycenter/set_required_contact_details_test.go
index 1c67f6ae..e796b0e5 100644
--- a/checks/cloud/azure/securitycenter/set_required_contact_details_test.go
+++ b/checks/cloud/azure/securitycenter/set_required_contact_details_test.go
@@ -3,12 +3,12 @@ package securitycenter
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/securitycenter"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/securitycenter"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/storage/allow_microsoft_service_bypass.go b/checks/cloud/azure/storage/allow_microsoft_service_bypass.go
index e1b44635..da535ccd 100755
--- a/checks/cloud/azure/storage/allow_microsoft_service_bypass.go
+++ b/checks/cloud/azure/storage/allow_microsoft_service_bypass.go
@@ -1,11 +1,11 @@
 package storage
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAllowMicrosoftServiceBypass = rules.Register(
diff --git a/checks/cloud/azure/storage/allow_microsoft_service_bypass_test.go b/checks/cloud/azure/storage/allow_microsoft_service_bypass_test.go
index 23199349..57f9b6c8 100644
--- a/checks/cloud/azure/storage/allow_microsoft_service_bypass_test.go
+++ b/checks/cloud/azure/storage/allow_microsoft_service_bypass_test.go
@@ -3,12 +3,12 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/storage/default_action_deny.go b/checks/cloud/azure/storage/default_action_deny.go
index a71ec254..62c24e4d 100755
--- a/checks/cloud/azure/storage/default_action_deny.go
+++ b/checks/cloud/azure/storage/default_action_deny.go
@@ -1,11 +1,11 @@
 package storage
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckDefaultActionDeny = rules.Register(
diff --git a/checks/cloud/azure/storage/default_action_deny_test.go b/checks/cloud/azure/storage/default_action_deny_test.go
index 45e755b6..716f69a1 100644
--- a/checks/cloud/azure/storage/default_action_deny_test.go
+++ b/checks/cloud/azure/storage/default_action_deny_test.go
@@ -3,12 +3,12 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/storage/enforce_https.go b/checks/cloud/azure/storage/enforce_https.go
index ef1246b9..4b2a7f0a 100755
--- a/checks/cloud/azure/storage/enforce_https.go
+++ b/checks/cloud/azure/storage/enforce_https.go
@@ -1,11 +1,11 @@
 package storage
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnforceHttps = rules.Register(
diff --git a/checks/cloud/azure/storage/enforce_https_test.go b/checks/cloud/azure/storage/enforce_https_test.go
index a42fae1c..97409be6 100644
--- a/checks/cloud/azure/storage/enforce_https_test.go
+++ b/checks/cloud/azure/storage/enforce_https_test.go
@@ -3,12 +3,12 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/storage/no_public_access.go b/checks/cloud/azure/storage/no_public_access.go
index 33bf1993..9febbf6a 100755
--- a/checks/cloud/azure/storage/no_public_access.go
+++ b/checks/cloud/azure/storage/no_public_access.go
@@ -1,12 +1,12 @@
 package storage
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/azure/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/azure/storage/no_public_access_test.go b/checks/cloud/azure/storage/no_public_access_test.go
index 01b6183d..8b092ef3 100644
--- a/checks/cloud/azure/storage/no_public_access_test.go
+++ b/checks/cloud/azure/storage/no_public_access_test.go
@@ -3,12 +3,12 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/storage/queue_services_logging_enabled.go b/checks/cloud/azure/storage/queue_services_logging_enabled.go
index e5b5b1fc..b4f505a6 100755
--- a/checks/cloud/azure/storage/queue_services_logging_enabled.go
+++ b/checks/cloud/azure/storage/queue_services_logging_enabled.go
@@ -1,11 +1,11 @@
 package storage
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckQueueServicesLoggingEnabled = rules.Register(
diff --git a/checks/cloud/azure/storage/queue_services_logging_enabled_test.go b/checks/cloud/azure/storage/queue_services_logging_enabled_test.go
index 129022cc..b3d048e1 100644
--- a/checks/cloud/azure/storage/queue_services_logging_enabled_test.go
+++ b/checks/cloud/azure/storage/queue_services_logging_enabled_test.go
@@ -3,12 +3,12 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/storage/use_secure_tls_policy.go b/checks/cloud/azure/storage/use_secure_tls_policy.go
index db383697..6d190aff 100755
--- a/checks/cloud/azure/storage/use_secure_tls_policy.go
+++ b/checks/cloud/azure/storage/use_secure_tls_policy.go
@@ -1,11 +1,11 @@
 package storage
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseSecureTlsPolicy = rules.Register(
diff --git a/checks/cloud/azure/storage/use_secure_tls_policy_test.go b/checks/cloud/azure/storage/use_secure_tls_policy_test.go
index 8ce2ba73..597bc89d 100644
--- a/checks/cloud/azure/storage/use_secure_tls_policy_test.go
+++ b/checks/cloud/azure/storage/use_secure_tls_policy_test.go
@@ -3,12 +3,12 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/azure/synapse/virtual_network_enabled.go b/checks/cloud/azure/synapse/virtual_network_enabled.go
index 24adfdf6..1ceee4c7 100755
--- a/checks/cloud/azure/synapse/virtual_network_enabled.go
+++ b/checks/cloud/azure/synapse/virtual_network_enabled.go
@@ -1,11 +1,11 @@
 package synapse
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckVirtualNetworkEnabled = rules.Register(
diff --git a/checks/cloud/azure/synapse/virtual_network_enabled_test.go b/checks/cloud/azure/synapse/virtual_network_enabled_test.go
index 0fa88176..3e9e5d3f 100644
--- a/checks/cloud/azure/synapse/virtual_network_enabled_test.go
+++ b/checks/cloud/azure/synapse/virtual_network_enabled_test.go
@@ -3,12 +3,12 @@ package synapse
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/azure/synapse"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/synapse"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/cloudstack/compute/no_sensitive_info.go b/checks/cloud/cloudstack/compute/no_sensitive_info.go
index dba3585b..7864f3e3 100755
--- a/checks/cloud/cloudstack/compute/no_sensitive_info.go
+++ b/checks/cloud/cloudstack/compute/no_sensitive_info.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/owenrumney/squealer/pkg/squealer"
 )
 
diff --git a/checks/cloud/cloudstack/compute/no_sensitive_info_test.go b/checks/cloud/cloudstack/compute/no_sensitive_info_test.go
index 36cac70e..7749e5da 100644
--- a/checks/cloud/cloudstack/compute/no_sensitive_info_test.go
+++ b/checks/cloud/cloudstack/compute/no_sensitive_info_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/cloudstack/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/cloudstack/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy.go b/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy.go
index 4364b058..3255bd52 100644
--- a/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy.go
+++ b/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAutoUpgrade = rules.Register(
diff --git a/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy_test.go b/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy_test.go
index 297d2602..ed9f5524 100644
--- a/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy_test.go
+++ b/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/digitalocean/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/digitalocean/compute/enforce_https.go b/checks/cloud/digitalocean/compute/enforce_https.go
index ad7e7385..e2248596 100755
--- a/checks/cloud/digitalocean/compute/enforce_https.go
+++ b/checks/cloud/digitalocean/compute/enforce_https.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnforceHttps = rules.Register(
diff --git a/checks/cloud/digitalocean/compute/enforce_https_test.go b/checks/cloud/digitalocean/compute/enforce_https_test.go
index 4e0f88a6..122b5d05 100644
--- a/checks/cloud/digitalocean/compute/enforce_https_test.go
+++ b/checks/cloud/digitalocean/compute/enforce_https_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/digitalocean/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades.go b/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades.go
index 298f8a44..698bc28c 100644
--- a/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades.go
+++ b/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckKubernetesSurgeUpgrades = rules.Register(
diff --git a/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades_test.go b/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades_test.go
index 24c6f036..45e2b3d2 100644
--- a/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades_test.go
+++ b/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/digitalocean/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/digitalocean/compute/no_public_egress.go b/checks/cloud/digitalocean/compute/no_public_egress.go
index c92f178c..23ae9cde 100755
--- a/checks/cloud/digitalocean/compute/no_public_egress.go
+++ b/checks/cloud/digitalocean/compute/no_public_egress.go
@@ -1,12 +1,12 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicEgress = rules.Register(
diff --git a/checks/cloud/digitalocean/compute/no_public_egress_test.go b/checks/cloud/digitalocean/compute/no_public_egress_test.go
index ec5318b0..5fabfb22 100644
--- a/checks/cloud/digitalocean/compute/no_public_egress_test.go
+++ b/checks/cloud/digitalocean/compute/no_public_egress_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/digitalocean/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/digitalocean/compute/no_public_ingress.go b/checks/cloud/digitalocean/compute/no_public_ingress.go
index 01d8a2d6..3af99a3d 100755
--- a/checks/cloud/digitalocean/compute/no_public_ingress.go
+++ b/checks/cloud/digitalocean/compute/no_public_ingress.go
@@ -1,12 +1,12 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngress = rules.Register(
diff --git a/checks/cloud/digitalocean/compute/no_public_ingress_test.go b/checks/cloud/digitalocean/compute/no_public_ingress_test.go
index 80981cc9..9e62113a 100644
--- a/checks/cloud/digitalocean/compute/no_public_ingress_test.go
+++ b/checks/cloud/digitalocean/compute/no_public_ingress_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/digitalocean/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/digitalocean/compute/use_ssh_keys.go b/checks/cloud/digitalocean/compute/use_ssh_keys.go
index 6ac25680..1f39e0da 100755
--- a/checks/cloud/digitalocean/compute/use_ssh_keys.go
+++ b/checks/cloud/digitalocean/compute/use_ssh_keys.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseSshKeys = rules.Register(
diff --git a/checks/cloud/digitalocean/compute/use_ssh_keys_test.go b/checks/cloud/digitalocean/compute/use_ssh_keys_test.go
index 639beb5f..df2eb038 100644
--- a/checks/cloud/digitalocean/compute/use_ssh_keys_test.go
+++ b/checks/cloud/digitalocean/compute/use_ssh_keys_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/digitalocean/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/digitalocean/spaces/acl_no_public_read.go b/checks/cloud/digitalocean/spaces/acl_no_public_read.go
index 308dc287..5106e574 100755
--- a/checks/cloud/digitalocean/spaces/acl_no_public_read.go
+++ b/checks/cloud/digitalocean/spaces/acl_no_public_read.go
@@ -1,11 +1,11 @@
 package spaces
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAclNoPublicRead = rules.Register(
diff --git a/checks/cloud/digitalocean/spaces/acl_no_public_read_test.go b/checks/cloud/digitalocean/spaces/acl_no_public_read_test.go
index 4f88f2b6..bd5170b6 100644
--- a/checks/cloud/digitalocean/spaces/acl_no_public_read_test.go
+++ b/checks/cloud/digitalocean/spaces/acl_no_public_read_test.go
@@ -3,12 +3,12 @@ package spaces
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/digitalocean/spaces"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/spaces"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/digitalocean/spaces/disable_force_destroy.go b/checks/cloud/digitalocean/spaces/disable_force_destroy.go
index d974000c..3eae103c 100755
--- a/checks/cloud/digitalocean/spaces/disable_force_destroy.go
+++ b/checks/cloud/digitalocean/spaces/disable_force_destroy.go
@@ -1,11 +1,11 @@
 package spaces
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckDisableForceDestroy = rules.Register(
diff --git a/checks/cloud/digitalocean/spaces/disable_force_destroy_test.go b/checks/cloud/digitalocean/spaces/disable_force_destroy_test.go
index da5429dc..743eac10 100644
--- a/checks/cloud/digitalocean/spaces/disable_force_destroy_test.go
+++ b/checks/cloud/digitalocean/spaces/disable_force_destroy_test.go
@@ -3,12 +3,12 @@ package spaces
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/digitalocean/spaces"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/spaces"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/digitalocean/spaces/versioning_enabled.go b/checks/cloud/digitalocean/spaces/versioning_enabled.go
index a98a93b7..2e9875fa 100755
--- a/checks/cloud/digitalocean/spaces/versioning_enabled.go
+++ b/checks/cloud/digitalocean/spaces/versioning_enabled.go
@@ -1,11 +1,11 @@
 package spaces
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckVersioningEnabled = rules.Register(
diff --git a/checks/cloud/digitalocean/spaces/versioning_enabled_test.go b/checks/cloud/digitalocean/spaces/versioning_enabled_test.go
index f30dc951..583d53cd 100644
--- a/checks/cloud/digitalocean/spaces/versioning_enabled_test.go
+++ b/checks/cloud/digitalocean/spaces/versioning_enabled_test.go
@@ -3,12 +3,12 @@ package spaces
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/digitalocean/spaces"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/spaces"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/github/actions/no_plain_text_action_secrets.go b/checks/cloud/github/actions/no_plain_text_action_secrets.go
index 439c548d..939f0128 100644
--- a/checks/cloud/github/actions/no_plain_text_action_secrets.go
+++ b/checks/cloud/github/actions/no_plain_text_action_secrets.go
@@ -1,11 +1,11 @@
 package actions
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPlainTextActionEnvironmentSecrets = rules.Register(
diff --git a/checks/cloud/github/actions/no_plain_text_action_secrets_test.go b/checks/cloud/github/actions/no_plain_text_action_secrets_test.go
index 5d653921..daf2d5ba 100644
--- a/checks/cloud/github/actions/no_plain_text_action_secrets_test.go
+++ b/checks/cloud/github/actions/no_plain_text_action_secrets_test.go
@@ -3,12 +3,12 @@ package actions
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/github"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/github"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/github/branch_protections/require_signed_commits.go b/checks/cloud/github/branch_protections/require_signed_commits.go
index 35980530..e5250664 100755
--- a/checks/cloud/github/branch_protections/require_signed_commits.go
+++ b/checks/cloud/github/branch_protections/require_signed_commits.go
@@ -1,11 +1,11 @@
 package branch_protections
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRequireSignedCommits = rules.Register(
diff --git a/checks/cloud/github/branch_protections/require_signed_commits_test.go b/checks/cloud/github/branch_protections/require_signed_commits_test.go
index f7732636..4945e8d1 100644
--- a/checks/cloud/github/branch_protections/require_signed_commits_test.go
+++ b/checks/cloud/github/branch_protections/require_signed_commits_test.go
@@ -3,12 +3,12 @@ package branch_protections
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/github"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/github"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/github/repositories/enable_vulnerability_alerts.go b/checks/cloud/github/repositories/enable_vulnerability_alerts.go
index ed727202..8bb64825 100755
--- a/checks/cloud/github/repositories/enable_vulnerability_alerts.go
+++ b/checks/cloud/github/repositories/enable_vulnerability_alerts.go
@@ -1,11 +1,11 @@
 package repositories
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableVulnerabilityAlerts = rules.Register(
diff --git a/checks/cloud/github/repositories/enable_vulnerability_alerts_test.go b/checks/cloud/github/repositories/enable_vulnerability_alerts_test.go
index c1e1e657..75d81c3b 100644
--- a/checks/cloud/github/repositories/enable_vulnerability_alerts_test.go
+++ b/checks/cloud/github/repositories/enable_vulnerability_alerts_test.go
@@ -3,12 +3,12 @@ package repositories
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/github"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/github"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/github/repositories/private.go b/checks/cloud/github/repositories/private.go
index 3623d336..35cc5526 100755
--- a/checks/cloud/github/repositories/private.go
+++ b/checks/cloud/github/repositories/private.go
@@ -1,11 +1,11 @@
 package repositories
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPrivate = rules.Register(
diff --git a/checks/cloud/github/repositories/private_test.go b/checks/cloud/github/repositories/private_test.go
index b3ddbd46..a979ac6a 100644
--- a/checks/cloud/github/repositories/private_test.go
+++ b/checks/cloud/github/repositories/private_test.go
@@ -3,12 +3,12 @@ package repositories
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/github"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/github"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/bigquery/no_public_access.go b/checks/cloud/google/bigquery/no_public_access.go
index eabeb4c5..9317cf8d 100755
--- a/checks/cloud/google/bigquery/no_public_access.go
+++ b/checks/cloud/google/bigquery/no_public_access.go
@@ -1,12 +1,12 @@
 package bigquery
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/bigquery"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/bigquery"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/google/bigquery/no_public_access_test.go b/checks/cloud/google/bigquery/no_public_access_test.go
index 376afd82..181f8d98 100644
--- a/checks/cloud/google/bigquery/no_public_access_test.go
+++ b/checks/cloud/google/bigquery/no_public_access_test.go
@@ -3,12 +3,12 @@ package bigquery
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/bigquery"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/bigquery"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/disk_encryption_customer_key.go b/checks/cloud/google/compute/disk_encryption_customer_key.go
index fc890a7d..ae6e5c5b 100755
--- a/checks/cloud/google/compute/disk_encryption_customer_key.go
+++ b/checks/cloud/google/compute/disk_encryption_customer_key.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckDiskEncryptionCustomerKey = rules.Register(
diff --git a/checks/cloud/google/compute/disk_encryption_customer_key_test.go b/checks/cloud/google/compute/disk_encryption_customer_key_test.go
index 289ba1cb..44838c2d 100644
--- a/checks/cloud/google/compute/disk_encryption_customer_key_test.go
+++ b/checks/cloud/google/compute/disk_encryption_customer_key_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/disk_encryption_no_plaintext_key.go b/checks/cloud/google/compute/disk_encryption_no_plaintext_key.go
index 8b5b9768..6a8629d0 100755
--- a/checks/cloud/google/compute/disk_encryption_no_plaintext_key.go
+++ b/checks/cloud/google/compute/disk_encryption_no_plaintext_key.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckDiskEncryptionRequired = rules.Register(
diff --git a/checks/cloud/google/compute/disk_encryption_no_plaintext_key_test.go b/checks/cloud/google/compute/disk_encryption_no_plaintext_key_test.go
index 8f54033f..222e8f41 100644
--- a/checks/cloud/google/compute/disk_encryption_no_plaintext_key_test.go
+++ b/checks/cloud/google/compute/disk_encryption_no_plaintext_key_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/enable_shielded_vm_im.go b/checks/cloud/google/compute/enable_shielded_vm_im.go
index 7392ba9d..c6178ef4 100755
--- a/checks/cloud/google/compute/enable_shielded_vm_im.go
+++ b/checks/cloud/google/compute/enable_shielded_vm_im.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableShieldedVMIntegrityMonitoring = rules.Register(
diff --git a/checks/cloud/google/compute/enable_shielded_vm_im_test.go b/checks/cloud/google/compute/enable_shielded_vm_im_test.go
index 7c6ffc50..74c7d7d3 100644
--- a/checks/cloud/google/compute/enable_shielded_vm_im_test.go
+++ b/checks/cloud/google/compute/enable_shielded_vm_im_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/enable_shielded_vm_sb.go b/checks/cloud/google/compute/enable_shielded_vm_sb.go
index 40651fc5..99f036ed 100644
--- a/checks/cloud/google/compute/enable_shielded_vm_sb.go
+++ b/checks/cloud/google/compute/enable_shielded_vm_sb.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableShieldedVMSecureBoot = rules.Register(
diff --git a/checks/cloud/google/compute/enable_shielded_vm_sb_test.go b/checks/cloud/google/compute/enable_shielded_vm_sb_test.go
index 9f69afe5..07168a3a 100644
--- a/checks/cloud/google/compute/enable_shielded_vm_sb_test.go
+++ b/checks/cloud/google/compute/enable_shielded_vm_sb_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/enable_shielded_vm_vtpm.go b/checks/cloud/google/compute/enable_shielded_vm_vtpm.go
index 1594e0ff..798e9496 100755
--- a/checks/cloud/google/compute/enable_shielded_vm_vtpm.go
+++ b/checks/cloud/google/compute/enable_shielded_vm_vtpm.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableShieldedVMVTPM = rules.Register(
diff --git a/checks/cloud/google/compute/enable_shielded_vm_vtpm_test.go b/checks/cloud/google/compute/enable_shielded_vm_vtpm_test.go
index 95b02fb3..9d5fdf29 100644
--- a/checks/cloud/google/compute/enable_shielded_vm_vtpm_test.go
+++ b/checks/cloud/google/compute/enable_shielded_vm_vtpm_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/enable_vpc_flow_logs.go b/checks/cloud/google/compute/enable_vpc_flow_logs.go
index a9add7b6..d41c137e 100755
--- a/checks/cloud/google/compute/enable_vpc_flow_logs.go
+++ b/checks/cloud/google/compute/enable_vpc_flow_logs.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableVPCFlowLogs = rules.Register(
diff --git a/checks/cloud/google/compute/enable_vpc_flow_logs_test.go b/checks/cloud/google/compute/enable_vpc_flow_logs_test.go
index 1fab2222..b4fbe7fc 100644
--- a/checks/cloud/google/compute/enable_vpc_flow_logs_test.go
+++ b/checks/cloud/google/compute/enable_vpc_flow_logs_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/no_default_service_account.go b/checks/cloud/google/compute/no_default_service_account.go
index 62fc521e..708fb6e0 100755
--- a/checks/cloud/google/compute/no_default_service_account.go
+++ b/checks/cloud/google/compute/no_default_service_account.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoDefaultServiceAccount = rules.Register(
diff --git a/checks/cloud/google/compute/no_default_service_account_test.go b/checks/cloud/google/compute/no_default_service_account_test.go
index 36b148d5..64663202 100644
--- a/checks/cloud/google/compute/no_default_service_account_test.go
+++ b/checks/cloud/google/compute/no_default_service_account_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/no_ip_forwarding.go b/checks/cloud/google/compute/no_ip_forwarding.go
index f61629db..643d43cc 100755
--- a/checks/cloud/google/compute/no_ip_forwarding.go
+++ b/checks/cloud/google/compute/no_ip_forwarding.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoIpForwarding = rules.Register(
diff --git a/checks/cloud/google/compute/no_ip_forwarding_test.go b/checks/cloud/google/compute/no_ip_forwarding_test.go
index 225d3816..bc35acdf 100644
--- a/checks/cloud/google/compute/no_ip_forwarding_test.go
+++ b/checks/cloud/google/compute/no_ip_forwarding_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/no_oslogin_override.go b/checks/cloud/google/compute/no_oslogin_override.go
index 7752fa24..cda676d1 100755
--- a/checks/cloud/google/compute/no_oslogin_override.go
+++ b/checks/cloud/google/compute/no_oslogin_override.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoOsloginOverride = rules.Register(
diff --git a/checks/cloud/google/compute/no_oslogin_override_test.go b/checks/cloud/google/compute/no_oslogin_override_test.go
index ac25a2e9..5002482b 100644
--- a/checks/cloud/google/compute/no_oslogin_override_test.go
+++ b/checks/cloud/google/compute/no_oslogin_override_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/no_project_wide_ssh_keys.go b/checks/cloud/google/compute/no_project_wide_ssh_keys.go
index b490a1a8..c6843e3a 100755
--- a/checks/cloud/google/compute/no_project_wide_ssh_keys.go
+++ b/checks/cloud/google/compute/no_project_wide_ssh_keys.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoProjectWideSshKeys = rules.Register(
diff --git a/checks/cloud/google/compute/no_project_wide_ssh_keys_test.go b/checks/cloud/google/compute/no_project_wide_ssh_keys_test.go
index e4b4927c..ed214b1d 100644
--- a/checks/cloud/google/compute/no_project_wide_ssh_keys_test.go
+++ b/checks/cloud/google/compute/no_project_wide_ssh_keys_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/no_public_egress.go b/checks/cloud/google/compute/no_public_egress.go
index addd9b10..2297ad86 100755
--- a/checks/cloud/google/compute/no_public_egress.go
+++ b/checks/cloud/google/compute/no_public_egress.go
@@ -1,12 +1,12 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicEgress = rules.Register(
diff --git a/checks/cloud/google/compute/no_public_egress_test.go b/checks/cloud/google/compute/no_public_egress_test.go
index 7eb0611f..1633203d 100644
--- a/checks/cloud/google/compute/no_public_egress_test.go
+++ b/checks/cloud/google/compute/no_public_egress_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/no_public_ingress.go b/checks/cloud/google/compute/no_public_ingress.go
index b169683b..cc69f18c 100755
--- a/checks/cloud/google/compute/no_public_ingress.go
+++ b/checks/cloud/google/compute/no_public_ingress.go
@@ -1,12 +1,12 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngress = rules.Register(
diff --git a/checks/cloud/google/compute/no_public_ingress_test.go b/checks/cloud/google/compute/no_public_ingress_test.go
index 4416ca9a..3f4e1cef 100644
--- a/checks/cloud/google/compute/no_public_ingress_test.go
+++ b/checks/cloud/google/compute/no_public_ingress_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/no_public_ip.go b/checks/cloud/google/compute/no_public_ip.go
index 510473c4..28e68520 100755
--- a/checks/cloud/google/compute/no_public_ip.go
+++ b/checks/cloud/google/compute/no_public_ip.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckInstancesDoNotHavePublicIPs = rules.Register(
diff --git a/checks/cloud/google/compute/no_public_ip_test.go b/checks/cloud/google/compute/no_public_ip_test.go
index 19b59da4..95b5cbec 100755
--- a/checks/cloud/google/compute/no_public_ip_test.go
+++ b/checks/cloud/google/compute/no_public_ip_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/no_serial_port.go b/checks/cloud/google/compute/no_serial_port.go
index 3831e910..471be49a 100755
--- a/checks/cloud/google/compute/no_serial_port.go
+++ b/checks/cloud/google/compute/no_serial_port.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoSerialPort = rules.Register(
diff --git a/checks/cloud/google/compute/no_serial_port_test.go b/checks/cloud/google/compute/no_serial_port_test.go
index d850a2b2..f4845141 100644
--- a/checks/cloud/google/compute/no_serial_port_test.go
+++ b/checks/cloud/google/compute/no_serial_port_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/project_level_oslogin.go b/checks/cloud/google/compute/project_level_oslogin.go
index cabaeea5..550fea1e 100755
--- a/checks/cloud/google/compute/project_level_oslogin.go
+++ b/checks/cloud/google/compute/project_level_oslogin.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckProjectLevelOslogin = rules.Register(
diff --git a/checks/cloud/google/compute/project_level_oslogin_test.go b/checks/cloud/google/compute/project_level_oslogin_test.go
index 899cf115..66e33f3b 100644
--- a/checks/cloud/google/compute/project_level_oslogin_test.go
+++ b/checks/cloud/google/compute/project_level_oslogin_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/use_secure_tls_policy.go b/checks/cloud/google/compute/use_secure_tls_policy.go
index 762e419c..91f51b1a 100755
--- a/checks/cloud/google/compute/use_secure_tls_policy.go
+++ b/checks/cloud/google/compute/use_secure_tls_policy.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseSecureTlsPolicy = rules.Register(
diff --git a/checks/cloud/google/compute/use_secure_tls_policy_test.go b/checks/cloud/google/compute/use_secure_tls_policy_test.go
index a1e8c0ea..44051b52 100644
--- a/checks/cloud/google/compute/use_secure_tls_policy_test.go
+++ b/checks/cloud/google/compute/use_secure_tls_policy_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/compute/vm_disk_encryption_customer_key.go b/checks/cloud/google/compute/vm_disk_encryption_customer_key.go
index 13524990..644925c1 100755
--- a/checks/cloud/google/compute/vm_disk_encryption_customer_key.go
+++ b/checks/cloud/google/compute/vm_disk_encryption_customer_key.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckVmDiskEncryptionCustomerKey = rules.Register(
diff --git a/checks/cloud/google/compute/vm_disk_encryption_customer_key_test.go b/checks/cloud/google/compute/vm_disk_encryption_customer_key_test.go
index ddfa940d..c9d39162 100644
--- a/checks/cloud/google/compute/vm_disk_encryption_customer_key_test.go
+++ b/checks/cloud/google/compute/vm_disk_encryption_customer_key_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/compute"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/compute"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/dns/enable_dnssec.go b/checks/cloud/google/dns/enable_dnssec.go
index db1caf9e..4f48882d 100755
--- a/checks/cloud/google/dns/enable_dnssec.go
+++ b/checks/cloud/google/dns/enable_dnssec.go
@@ -1,11 +1,11 @@
 package dns
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableDnssec = rules.Register(
diff --git a/checks/cloud/google/dns/enable_dnssec_test.go b/checks/cloud/google/dns/enable_dnssec_test.go
index fb890ada..4a0fb1e7 100644
--- a/checks/cloud/google/dns/enable_dnssec_test.go
+++ b/checks/cloud/google/dns/enable_dnssec_test.go
@@ -3,12 +3,12 @@ package dns
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/dns"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/dns"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/dns/no_rsa_sha1.go b/checks/cloud/google/dns/no_rsa_sha1.go
index 7920f3cb..7d8e978a 100755
--- a/checks/cloud/google/dns/no_rsa_sha1.go
+++ b/checks/cloud/google/dns/no_rsa_sha1.go
@@ -3,11 +3,11 @@ package dns
 import (
 	"fmt"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoRsaSha1 = rules.Register(
diff --git a/checks/cloud/google/dns/no_rsa_sha1_test.go b/checks/cloud/google/dns/no_rsa_sha1_test.go
index 544f5361..b385b09f 100644
--- a/checks/cloud/google/dns/no_rsa_sha1_test.go
+++ b/checks/cloud/google/dns/no_rsa_sha1_test.go
@@ -3,12 +3,12 @@ package dns
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/dns"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/dns"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/enable_auto_repair.go b/checks/cloud/google/gke/enable_auto_repair.go
index 3c7e63cc..9f84d9a0 100755
--- a/checks/cloud/google/gke/enable_auto_repair.go
+++ b/checks/cloud/google/gke/enable_auto_repair.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAutoRepair = rules.Register(
diff --git a/checks/cloud/google/gke/enable_auto_repair_test.go b/checks/cloud/google/gke/enable_auto_repair_test.go
index 27fd0a6b..0d0b871b 100644
--- a/checks/cloud/google/gke/enable_auto_repair_test.go
+++ b/checks/cloud/google/gke/enable_auto_repair_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/enable_auto_upgrade.go b/checks/cloud/google/gke/enable_auto_upgrade.go
index c8753c22..b842b244 100755
--- a/checks/cloud/google/gke/enable_auto_upgrade.go
+++ b/checks/cloud/google/gke/enable_auto_upgrade.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableAutoUpgrade = rules.Register(
diff --git a/checks/cloud/google/gke/enable_auto_upgrade_test.go b/checks/cloud/google/gke/enable_auto_upgrade_test.go
index 768f6946..01208ad5 100644
--- a/checks/cloud/google/gke/enable_auto_upgrade_test.go
+++ b/checks/cloud/google/gke/enable_auto_upgrade_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/enable_ip_aliasing.go b/checks/cloud/google/gke/enable_ip_aliasing.go
index ab9f544c..e6444568 100755
--- a/checks/cloud/google/gke/enable_ip_aliasing.go
+++ b/checks/cloud/google/gke/enable_ip_aliasing.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableIpAliasing = rules.Register(
diff --git a/checks/cloud/google/gke/enable_ip_aliasing_test.go b/checks/cloud/google/gke/enable_ip_aliasing_test.go
index 5299ac01..9e43e6cb 100644
--- a/checks/cloud/google/gke/enable_ip_aliasing_test.go
+++ b/checks/cloud/google/gke/enable_ip_aliasing_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/enable_master_networks.go b/checks/cloud/google/gke/enable_master_networks.go
index 6c2377ad..971aef34 100755
--- a/checks/cloud/google/gke/enable_master_networks.go
+++ b/checks/cloud/google/gke/enable_master_networks.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableMasterNetworks = rules.Register(
diff --git a/checks/cloud/google/gke/enable_master_networks_test.go b/checks/cloud/google/gke/enable_master_networks_test.go
index 0e4a1f85..37677f02 100644
--- a/checks/cloud/google/gke/enable_master_networks_test.go
+++ b/checks/cloud/google/gke/enable_master_networks_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/enable_network_policy.go b/checks/cloud/google/gke/enable_network_policy.go
index 560eebea..ea68eb94 100755
--- a/checks/cloud/google/gke/enable_network_policy.go
+++ b/checks/cloud/google/gke/enable_network_policy.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableNetworkPolicy = rules.Register(
diff --git a/checks/cloud/google/gke/enable_network_policy_test.go b/checks/cloud/google/gke/enable_network_policy_test.go
index 70f0c1e2..cb7e32c6 100644
--- a/checks/cloud/google/gke/enable_network_policy_test.go
+++ b/checks/cloud/google/gke/enable_network_policy_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/enable_private_cluster.go b/checks/cloud/google/gke/enable_private_cluster.go
index f2360ac7..40944e6d 100755
--- a/checks/cloud/google/gke/enable_private_cluster.go
+++ b/checks/cloud/google/gke/enable_private_cluster.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnablePrivateCluster = rules.Register(
diff --git a/checks/cloud/google/gke/enable_private_cluster_test.go b/checks/cloud/google/gke/enable_private_cluster_test.go
index 49416725..5439858e 100644
--- a/checks/cloud/google/gke/enable_private_cluster_test.go
+++ b/checks/cloud/google/gke/enable_private_cluster_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/enable_stackdriver_logging.go b/checks/cloud/google/gke/enable_stackdriver_logging.go
index 8acd337d..c24cc7e1 100755
--- a/checks/cloud/google/gke/enable_stackdriver_logging.go
+++ b/checks/cloud/google/gke/enable_stackdriver_logging.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableStackdriverLogging = rules.Register(
diff --git a/checks/cloud/google/gke/enable_stackdriver_logging_test.go b/checks/cloud/google/gke/enable_stackdriver_logging_test.go
index a5db39d2..1c5c8287 100644
--- a/checks/cloud/google/gke/enable_stackdriver_logging_test.go
+++ b/checks/cloud/google/gke/enable_stackdriver_logging_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/enable_stackdriver_monitoring.go b/checks/cloud/google/gke/enable_stackdriver_monitoring.go
index 68e087c7..97261a92 100755
--- a/checks/cloud/google/gke/enable_stackdriver_monitoring.go
+++ b/checks/cloud/google/gke/enable_stackdriver_monitoring.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableStackdriverMonitoring = rules.Register(
diff --git a/checks/cloud/google/gke/enable_stackdriver_monitoring_test.go b/checks/cloud/google/gke/enable_stackdriver_monitoring_test.go
index b665dfe4..cdb26b6e 100644
--- a/checks/cloud/google/gke/enable_stackdriver_monitoring_test.go
+++ b/checks/cloud/google/gke/enable_stackdriver_monitoring_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/metadata_endpoints_disabled.go b/checks/cloud/google/gke/metadata_endpoints_disabled.go
index ad6faab3..0c1935dd 100755
--- a/checks/cloud/google/gke/metadata_endpoints_disabled.go
+++ b/checks/cloud/google/gke/metadata_endpoints_disabled.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckMetadataEndpointsDisabled = rules.Register(
diff --git a/checks/cloud/google/gke/metadata_endpoints_disabled_test.go b/checks/cloud/google/gke/metadata_endpoints_disabled_test.go
index 6e60161a..a201f246 100644
--- a/checks/cloud/google/gke/metadata_endpoints_disabled_test.go
+++ b/checks/cloud/google/gke/metadata_endpoints_disabled_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/no_legacy_authentication.go b/checks/cloud/google/gke/no_legacy_authentication.go
index 35948664..30f07c64 100755
--- a/checks/cloud/google/gke/no_legacy_authentication.go
+++ b/checks/cloud/google/gke/no_legacy_authentication.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoLegacyAuthentication = rules.Register(
diff --git a/checks/cloud/google/gke/no_legacy_authentication_test.go b/checks/cloud/google/gke/no_legacy_authentication_test.go
index 851d5b2c..2f970de6 100644
--- a/checks/cloud/google/gke/no_legacy_authentication_test.go
+++ b/checks/cloud/google/gke/no_legacy_authentication_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/no_public_control_plane.go b/checks/cloud/google/gke/no_public_control_plane.go
index 2b51725e..7a6004a0 100755
--- a/checks/cloud/google/gke/no_public_control_plane.go
+++ b/checks/cloud/google/gke/no_public_control_plane.go
@@ -1,12 +1,12 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicControlPlane = rules.Register(
diff --git a/checks/cloud/google/gke/no_public_control_plane_test.go b/checks/cloud/google/gke/no_public_control_plane_test.go
index 51360f2e..7afd3526 100644
--- a/checks/cloud/google/gke/no_public_control_plane_test.go
+++ b/checks/cloud/google/gke/no_public_control_plane_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/node_metadata_security.go b/checks/cloud/google/gke/node_metadata_security.go
index e623215d..2e9b0cbf 100755
--- a/checks/cloud/google/gke/node_metadata_security.go
+++ b/checks/cloud/google/gke/node_metadata_security.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNodeMetadataSecurity = rules.Register(
diff --git a/checks/cloud/google/gke/node_metadata_security_test.go b/checks/cloud/google/gke/node_metadata_security_test.go
index e6e35cb6..451f3373 100644
--- a/checks/cloud/google/gke/node_metadata_security_test.go
+++ b/checks/cloud/google/gke/node_metadata_security_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/node_pool_uses_cos.go b/checks/cloud/google/gke/node_pool_uses_cos.go
index 4a415f68..b4217f52 100755
--- a/checks/cloud/google/gke/node_pool_uses_cos.go
+++ b/checks/cloud/google/gke/node_pool_uses_cos.go
@@ -1,12 +1,12 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
-	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var CheckNodePoolUsesCos = rules.Register(
diff --git a/checks/cloud/google/gke/node_pool_uses_cos_test.go b/checks/cloud/google/gke/node_pool_uses_cos_test.go
index fa6f0e57..3aaea1aa 100644
--- a/checks/cloud/google/gke/node_pool_uses_cos_test.go
+++ b/checks/cloud/google/gke/node_pool_uses_cos_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/node_shielding_enabled.go b/checks/cloud/google/gke/node_shielding_enabled.go
index 2c12579b..78347219 100755
--- a/checks/cloud/google/gke/node_shielding_enabled.go
+++ b/checks/cloud/google/gke/node_shielding_enabled.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNodeShieldingEnabled = rules.Register(
diff --git a/checks/cloud/google/gke/node_shielding_enabled_test.go b/checks/cloud/google/gke/node_shielding_enabled_test.go
index e1d6c0f7..64ba8bff 100644
--- a/checks/cloud/google/gke/node_shielding_enabled_test.go
+++ b/checks/cloud/google/gke/node_shielding_enabled_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/use_cluster_labels.go b/checks/cloud/google/gke/use_cluster_labels.go
index de152664..6d133716 100755
--- a/checks/cloud/google/gke/use_cluster_labels.go
+++ b/checks/cloud/google/gke/use_cluster_labels.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseClusterLabels = rules.Register(
diff --git a/checks/cloud/google/gke/use_cluster_labels_test.go b/checks/cloud/google/gke/use_cluster_labels_test.go
index d54b22af..a1d83aa3 100644
--- a/checks/cloud/google/gke/use_cluster_labels_test.go
+++ b/checks/cloud/google/gke/use_cluster_labels_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/use_rbac_permissions.go b/checks/cloud/google/gke/use_rbac_permissions.go
index bdccdd26..53ee0417 100755
--- a/checks/cloud/google/gke/use_rbac_permissions.go
+++ b/checks/cloud/google/gke/use_rbac_permissions.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseRbacPermissions = rules.Register(
diff --git a/checks/cloud/google/gke/use_rbac_permissions_test.go b/checks/cloud/google/gke/use_rbac_permissions_test.go
index e40bec20..45c15c98 100644
--- a/checks/cloud/google/gke/use_rbac_permissions_test.go
+++ b/checks/cloud/google/gke/use_rbac_permissions_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/gke/use_service_account.go b/checks/cloud/google/gke/use_service_account.go
index cd776003..bd0e663d 100755
--- a/checks/cloud/google/gke/use_service_account.go
+++ b/checks/cloud/google/gke/use_service_account.go
@@ -1,11 +1,11 @@
 package gke
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckUseServiceAccount = rules.Register(
diff --git a/checks/cloud/google/gke/use_service_account_test.go b/checks/cloud/google/gke/use_service_account_test.go
index 4b8d8278..9c8533e6 100644
--- a/checks/cloud/google/gke/use_service_account_test.go
+++ b/checks/cloud/google/gke/use_service_account_test.go
@@ -3,12 +3,12 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/gke"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/gke"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider.go b/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider.go
index 4ce4d906..ad328bd0 100644
--- a/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider.go
+++ b/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider.go
@@ -1,11 +1,11 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoConditionOnWorkloadIdentityPoolProvider = rules.Register(
diff --git a/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider_test.go b/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider_test.go
index 171aabd8..97ff53e1 100644
--- a/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider_test.go
+++ b/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_default_network.go b/checks/cloud/google/iam/no_default_network.go
index 2c51f298..d22fcd4e 100755
--- a/checks/cloud/google/iam/no_default_network.go
+++ b/checks/cloud/google/iam/no_default_network.go
@@ -1,11 +1,11 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoDefaultNetwork = rules.Register(
diff --git a/checks/cloud/google/iam/no_default_network_test.go b/checks/cloud/google/iam/no_default_network_test.go
index d85f8898..29a9964b 100644
--- a/checks/cloud/google/iam/no_default_network_test.go
+++ b/checks/cloud/google/iam/no_default_network_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_folder_level_default_service_account_assignment.go b/checks/cloud/google/iam/no_folder_level_default_service_account_assignment.go
index d47051a6..933104c7 100755
--- a/checks/cloud/google/iam/no_folder_level_default_service_account_assignment.go
+++ b/checks/cloud/google/iam/no_folder_level_default_service_account_assignment.go
@@ -3,15 +3,15 @@ package iam
 import (
 	"strings"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckNoFolderLevelDefaultServiceAccountAssignment = rules.Register(
diff --git a/checks/cloud/google/iam/no_folder_level_default_service_account_assignment_test.go b/checks/cloud/google/iam/no_folder_level_default_service_account_assignment_test.go
index fe14b4c1..dcb3f4f0 100644
--- a/checks/cloud/google/iam/no_folder_level_default_service_account_assignment_test.go
+++ b/checks/cloud/google/iam/no_folder_level_default_service_account_assignment_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_folder_level_service_account_impersonation.go b/checks/cloud/google/iam/no_folder_level_service_account_impersonation.go
index 6e7c5362..e8238d5c 100755
--- a/checks/cloud/google/iam/no_folder_level_service_account_impersonation.go
+++ b/checks/cloud/google/iam/no_folder_level_service_account_impersonation.go
@@ -1,11 +1,11 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoFolderLevelServiceAccountImpersonation = rules.Register(
diff --git a/checks/cloud/google/iam/no_folder_level_service_account_impersonation_test.go b/checks/cloud/google/iam/no_folder_level_service_account_impersonation_test.go
index ea9aac81..b11bd9ee 100644
--- a/checks/cloud/google/iam/no_folder_level_service_account_impersonation_test.go
+++ b/checks/cloud/google/iam/no_folder_level_service_account_impersonation_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_org_level_default_service_account_assignment.go b/checks/cloud/google/iam/no_org_level_default_service_account_assignment.go
index 2b022c17..02d932c9 100755
--- a/checks/cloud/google/iam/no_org_level_default_service_account_assignment.go
+++ b/checks/cloud/google/iam/no_org_level_default_service_account_assignment.go
@@ -1,11 +1,11 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoOrgLevelDefaultServiceAccountAssignment = rules.Register(
diff --git a/checks/cloud/google/iam/no_org_level_default_service_account_assignment_test.go b/checks/cloud/google/iam/no_org_level_default_service_account_assignment_test.go
index f872a196..bdbb215e 100644
--- a/checks/cloud/google/iam/no_org_level_default_service_account_assignment_test.go
+++ b/checks/cloud/google/iam/no_org_level_default_service_account_assignment_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_org_level_service_account_impersonation.go b/checks/cloud/google/iam/no_org_level_service_account_impersonation.go
index 601e3208..a26f099c 100755
--- a/checks/cloud/google/iam/no_org_level_service_account_impersonation.go
+++ b/checks/cloud/google/iam/no_org_level_service_account_impersonation.go
@@ -1,11 +1,11 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoOrgLevelServiceAccountImpersonation = rules.Register(
diff --git a/checks/cloud/google/iam/no_org_level_service_account_impersonation_test.go b/checks/cloud/google/iam/no_org_level_service_account_impersonation_test.go
index dd195bca..deb0845f 100644
--- a/checks/cloud/google/iam/no_org_level_service_account_impersonation_test.go
+++ b/checks/cloud/google/iam/no_org_level_service_account_impersonation_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_privileged_service_accounts.go b/checks/cloud/google/iam/no_privileged_service_accounts.go
index 1caf1915..c5e8475a 100755
--- a/checks/cloud/google/iam/no_privileged_service_accounts.go
+++ b/checks/cloud/google/iam/no_privileged_service_accounts.go
@@ -3,15 +3,15 @@ package iam
 import (
 	"strings"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckNoPrivilegedServiceAccounts = rules.Register(
diff --git a/checks/cloud/google/iam/no_privileged_service_accounts_test.go b/checks/cloud/google/iam/no_privileged_service_accounts_test.go
index 04dc7a86..f6b9c5b8 100644
--- a/checks/cloud/google/iam/no_privileged_service_accounts_test.go
+++ b/checks/cloud/google/iam/no_privileged_service_accounts_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_project_level_default_service_account_assignment.go b/checks/cloud/google/iam/no_project_level_default_service_account_assignment.go
index c5be27e3..2a4ac007 100755
--- a/checks/cloud/google/iam/no_project_level_default_service_account_assignment.go
+++ b/checks/cloud/google/iam/no_project_level_default_service_account_assignment.go
@@ -1,11 +1,11 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoProjectLevelDefaultServiceAccountAssignment = rules.Register(
diff --git a/checks/cloud/google/iam/no_project_level_default_service_account_assignment_test.go b/checks/cloud/google/iam/no_project_level_default_service_account_assignment_test.go
index 429f35dc..ef0bb2bb 100644
--- a/checks/cloud/google/iam/no_project_level_default_service_account_assignment_test.go
+++ b/checks/cloud/google/iam/no_project_level_default_service_account_assignment_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_project_level_service_account_impersonation.go b/checks/cloud/google/iam/no_project_level_service_account_impersonation.go
index 84c37f50..6febce8c 100755
--- a/checks/cloud/google/iam/no_project_level_service_account_impersonation.go
+++ b/checks/cloud/google/iam/no_project_level_service_account_impersonation.go
@@ -1,11 +1,11 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoProjectLevelServiceAccountImpersonation = rules.Register(
diff --git a/checks/cloud/google/iam/no_project_level_service_account_impersonation_test.go b/checks/cloud/google/iam/no_project_level_service_account_impersonation_test.go
index 71e57b40..78924a8a 100644
--- a/checks/cloud/google/iam/no_project_level_service_account_impersonation_test.go
+++ b/checks/cloud/google/iam/no_project_level_service_account_impersonation_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/iam/no_user_granted_permissions.go b/checks/cloud/google/iam/no_user_granted_permissions.go
index 8fd6c237..f13c71ea 100755
--- a/checks/cloud/google/iam/no_user_granted_permissions.go
+++ b/checks/cloud/google/iam/no_user_granted_permissions.go
@@ -1,11 +1,11 @@
 package iam
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoUserGrantedPermissions = rules.Register(
diff --git a/checks/cloud/google/iam/no_user_granted_permissions_test.go b/checks/cloud/google/iam/no_user_granted_permissions_test.go
index 9fc87bb7..5ec24224 100644
--- a/checks/cloud/google/iam/no_user_granted_permissions_test.go
+++ b/checks/cloud/google/iam/no_user_granted_permissions_test.go
@@ -3,12 +3,12 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/kms/rotate_kms_keys.go b/checks/cloud/google/kms/rotate_kms_keys.go
index bff552a5..d2979620 100755
--- a/checks/cloud/google/kms/rotate_kms_keys.go
+++ b/checks/cloud/google/kms/rotate_kms_keys.go
@@ -1,11 +1,11 @@
 package kms
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckRotateKmsKeys = rules.Register(
diff --git a/checks/cloud/google/kms/rotate_kms_keys_test.go b/checks/cloud/google/kms/rotate_kms_keys_test.go
index f3f81459..7a69b9fd 100644
--- a/checks/cloud/google/kms/rotate_kms_keys_test.go
+++ b/checks/cloud/google/kms/rotate_kms_keys_test.go
@@ -3,12 +3,12 @@ package kms
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/kms"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/kms"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/enable_backup.go b/checks/cloud/google/sql/enable_backup.go
index fef25a67..5697c500 100755
--- a/checks/cloud/google/sql/enable_backup.go
+++ b/checks/cloud/google/sql/enable_backup.go
@@ -1,11 +1,11 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableBackup = rules.Register(
diff --git a/checks/cloud/google/sql/enable_backup_test.go b/checks/cloud/google/sql/enable_backup_test.go
index 2795f8b9..f60d05ce 100644
--- a/checks/cloud/google/sql/enable_backup_test.go
+++ b/checks/cloud/google/sql/enable_backup_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/enable_pg_temp_file_logging.go b/checks/cloud/google/sql/enable_pg_temp_file_logging.go
index db86b255..9886332e 100755
--- a/checks/cloud/google/sql/enable_pg_temp_file_logging.go
+++ b/checks/cloud/google/sql/enable_pg_temp_file_logging.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnablePgTempFileLogging = rules.Register(
diff --git a/checks/cloud/google/sql/enable_pg_temp_file_logging_test.go b/checks/cloud/google/sql/enable_pg_temp_file_logging_test.go
index 5db2a93e..251a5dae 100644
--- a/checks/cloud/google/sql/enable_pg_temp_file_logging_test.go
+++ b/checks/cloud/google/sql/enable_pg_temp_file_logging_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/encrypt_in_transit_data.go b/checks/cloud/google/sql/encrypt_in_transit_data.go
index 2ff9f617..40431908 100755
--- a/checks/cloud/google/sql/encrypt_in_transit_data.go
+++ b/checks/cloud/google/sql/encrypt_in_transit_data.go
@@ -1,11 +1,11 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEncryptInTransitData = rules.Register(
diff --git a/checks/cloud/google/sql/encrypt_in_transit_data_test.go b/checks/cloud/google/sql/encrypt_in_transit_data_test.go
index 8c906760..bf91dd6d 100644
--- a/checks/cloud/google/sql/encrypt_in_transit_data_test.go
+++ b/checks/cloud/google/sql/encrypt_in_transit_data_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/mysql_no_local_infile.go b/checks/cloud/google/sql/mysql_no_local_infile.go
index 0af82960..375e7ffe 100755
--- a/checks/cloud/google/sql/mysql_no_local_infile.go
+++ b/checks/cloud/google/sql/mysql_no_local_infile.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckMysqlNoLocalInfile = rules.Register(
diff --git a/checks/cloud/google/sql/mysql_no_local_infile_test.go b/checks/cloud/google/sql/mysql_no_local_infile_test.go
index bcb9b4da..e86ebfee 100644
--- a/checks/cloud/google/sql/mysql_no_local_infile_test.go
+++ b/checks/cloud/google/sql/mysql_no_local_infile_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/no_contained_db_auth.go b/checks/cloud/google/sql/no_contained_db_auth.go
index df14ef01..17a0de19 100755
--- a/checks/cloud/google/sql/no_contained_db_auth.go
+++ b/checks/cloud/google/sql/no_contained_db_auth.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoContainedDbAuth = rules.Register(
diff --git a/checks/cloud/google/sql/no_contained_db_auth_test.go b/checks/cloud/google/sql/no_contained_db_auth_test.go
index 873ca90c..c868a0d8 100644
--- a/checks/cloud/google/sql/no_contained_db_auth_test.go
+++ b/checks/cloud/google/sql/no_contained_db_auth_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/no_cross_db_ownership_chaining.go b/checks/cloud/google/sql/no_cross_db_ownership_chaining.go
index dec577e7..6bfa6e79 100755
--- a/checks/cloud/google/sql/no_cross_db_ownership_chaining.go
+++ b/checks/cloud/google/sql/no_cross_db_ownership_chaining.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoCrossDbOwnershipChaining = rules.Register(
diff --git a/checks/cloud/google/sql/no_cross_db_ownership_chaining_test.go b/checks/cloud/google/sql/no_cross_db_ownership_chaining_test.go
index 7bea9871..4374bb20 100644
--- a/checks/cloud/google/sql/no_cross_db_ownership_chaining_test.go
+++ b/checks/cloud/google/sql/no_cross_db_ownership_chaining_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/no_public_access.go b/checks/cloud/google/sql/no_public_access.go
index 66021e4d..f2ada4a9 100755
--- a/checks/cloud/google/sql/no_public_access.go
+++ b/checks/cloud/google/sql/no_public_access.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/google/sql/no_public_access_test.go b/checks/cloud/google/sql/no_public_access_test.go
index 18c5e550..8718db56 100644
--- a/checks/cloud/google/sql/no_public_access_test.go
+++ b/checks/cloud/google/sql/no_public_access_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/pg_log_checkpoints.go b/checks/cloud/google/sql/pg_log_checkpoints.go
index 50dae19f..dfc7215e 100755
--- a/checks/cloud/google/sql/pg_log_checkpoints.go
+++ b/checks/cloud/google/sql/pg_log_checkpoints.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPgLogCheckpoints = rules.Register(
diff --git a/checks/cloud/google/sql/pg_log_checkpoints_test.go b/checks/cloud/google/sql/pg_log_checkpoints_test.go
index a440026a..ea6a9a7e 100644
--- a/checks/cloud/google/sql/pg_log_checkpoints_test.go
+++ b/checks/cloud/google/sql/pg_log_checkpoints_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/pg_log_connections.go b/checks/cloud/google/sql/pg_log_connections.go
index 151c7796..3d5b5743 100755
--- a/checks/cloud/google/sql/pg_log_connections.go
+++ b/checks/cloud/google/sql/pg_log_connections.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPgLogConnections = rules.Register(
diff --git a/checks/cloud/google/sql/pg_log_connections_test.go b/checks/cloud/google/sql/pg_log_connections_test.go
index 7472a3a1..a0ad1f73 100644
--- a/checks/cloud/google/sql/pg_log_connections_test.go
+++ b/checks/cloud/google/sql/pg_log_connections_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/pg_log_disconnections.go b/checks/cloud/google/sql/pg_log_disconnections.go
index 41c4045e..d63793a4 100755
--- a/checks/cloud/google/sql/pg_log_disconnections.go
+++ b/checks/cloud/google/sql/pg_log_disconnections.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPgLogDisconnections = rules.Register(
diff --git a/checks/cloud/google/sql/pg_log_disconnections_test.go b/checks/cloud/google/sql/pg_log_disconnections_test.go
index 69042d2f..0152e4cd 100644
--- a/checks/cloud/google/sql/pg_log_disconnections_test.go
+++ b/checks/cloud/google/sql/pg_log_disconnections_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/pg_log_errors.go b/checks/cloud/google/sql/pg_log_errors.go
index f2695ccb..1176d7cf 100755
--- a/checks/cloud/google/sql/pg_log_errors.go
+++ b/checks/cloud/google/sql/pg_log_errors.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPgLogErrors = rules.Register(
diff --git a/checks/cloud/google/sql/pg_log_errors_test.go b/checks/cloud/google/sql/pg_log_errors_test.go
index 7954bf78..51e7351f 100644
--- a/checks/cloud/google/sql/pg_log_errors_test.go
+++ b/checks/cloud/google/sql/pg_log_errors_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/pg_log_lock_waits.go b/checks/cloud/google/sql/pg_log_lock_waits.go
index 86d80f68..03bb2973 100755
--- a/checks/cloud/google/sql/pg_log_lock_waits.go
+++ b/checks/cloud/google/sql/pg_log_lock_waits.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPgLogLockWaits = rules.Register(
diff --git a/checks/cloud/google/sql/pg_log_lock_waits_test.go b/checks/cloud/google/sql/pg_log_lock_waits_test.go
index b90d2dd1..429d0e2d 100644
--- a/checks/cloud/google/sql/pg_log_lock_waits_test.go
+++ b/checks/cloud/google/sql/pg_log_lock_waits_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/sql/pg_no_min_statement_logging.go b/checks/cloud/google/sql/pg_no_min_statement_logging.go
index dd78cfe3..49947abc 100755
--- a/checks/cloud/google/sql/pg_no_min_statement_logging.go
+++ b/checks/cloud/google/sql/pg_no_min_statement_logging.go
@@ -1,12 +1,12 @@
 package sql
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckPgNoMinStatementLogging = rules.Register(
diff --git a/checks/cloud/google/sql/pg_no_min_statement_logging_test.go b/checks/cloud/google/sql/pg_no_min_statement_logging_test.go
index 1481a4b0..6930835d 100644
--- a/checks/cloud/google/sql/pg_no_min_statement_logging_test.go
+++ b/checks/cloud/google/sql/pg_no_min_statement_logging_test.go
@@ -3,12 +3,12 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/sql"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/sql"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/storage/bucket_encryption_customer_key.go b/checks/cloud/google/storage/bucket_encryption_customer_key.go
index baa8134a..991481cb 100755
--- a/checks/cloud/google/storage/bucket_encryption_customer_key.go
+++ b/checks/cloud/google/storage/bucket_encryption_customer_key.go
@@ -1,11 +1,11 @@
 package storage
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckBucketEncryptionCustomerKey = rules.Register(
diff --git a/checks/cloud/google/storage/bucket_encryption_customer_test.go b/checks/cloud/google/storage/bucket_encryption_customer_test.go
index 4d24a501..c0bb54f2 100644
--- a/checks/cloud/google/storage/bucket_encryption_customer_test.go
+++ b/checks/cloud/google/storage/bucket_encryption_customer_test.go
@@ -3,12 +3,12 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/storage/enable_ubla.go b/checks/cloud/google/storage/enable_ubla.go
index 085af6e4..58730057 100755
--- a/checks/cloud/google/storage/enable_ubla.go
+++ b/checks/cloud/google/storage/enable_ubla.go
@@ -1,11 +1,11 @@
 package storage
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckEnableUbla = rules.Register(
diff --git a/checks/cloud/google/storage/enable_ubla_test.go b/checks/cloud/google/storage/enable_ubla_test.go
index f16f6096..3885dbe5 100644
--- a/checks/cloud/google/storage/enable_ubla_test.go
+++ b/checks/cloud/google/storage/enable_ubla_test.go
@@ -3,12 +3,12 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/google/storage/no_public_access.go b/checks/cloud/google/storage/no_public_access.go
index ebc47ca3..bc8a0f16 100755
--- a/checks/cloud/google/storage/no_public_access.go
+++ b/checks/cloud/google/storage/no_public_access.go
@@ -1,11 +1,11 @@
 package storage
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/google/storage/no_public_access_test.go b/checks/cloud/google/storage/no_public_access_test.go
index 44f4ed44..261ffdba 100644
--- a/checks/cloud/google/storage/no_public_access_test.go
+++ b/checks/cloud/google/storage/no_public_access_test.go
@@ -3,13 +3,13 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/google/iam"
-	"github.com/aquasecurity/defsec/pkg/providers/google/storage"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/iam"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/google/storage"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/computing/add_description_to_security_group.go b/checks/cloud/nifcloud/computing/add_description_to_security_group.go
index c4c5a0e0..7dc747d5 100755
--- a/checks/cloud/nifcloud/computing/add_description_to_security_group.go
+++ b/checks/cloud/nifcloud/computing/add_description_to_security_group.go
@@ -1,11 +1,11 @@
 package computing
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddDescriptionToSecurityGroup = rules.Register(
diff --git a/checks/cloud/nifcloud/computing/add_description_to_security_group_rule.go b/checks/cloud/nifcloud/computing/add_description_to_security_group_rule.go
index 8bd42b12..bfa802a8 100755
--- a/checks/cloud/nifcloud/computing/add_description_to_security_group_rule.go
+++ b/checks/cloud/nifcloud/computing/add_description_to_security_group_rule.go
@@ -1,11 +1,11 @@
 package computing
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddDescriptionToSecurityGroupRule = rules.Register(
diff --git a/checks/cloud/nifcloud/computing/add_description_to_security_group_rule_test.go b/checks/cloud/nifcloud/computing/add_description_to_security_group_rule_test.go
index 57312bdb..6238f7a8 100644
--- a/checks/cloud/nifcloud/computing/add_description_to_security_group_rule_test.go
+++ b/checks/cloud/nifcloud/computing/add_description_to_security_group_rule_test.go
@@ -3,12 +3,12 @@ package computing
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/computing/add_description_to_security_group_test.go b/checks/cloud/nifcloud/computing/add_description_to_security_group_test.go
index 532dc6a9..6541c7b7 100644
--- a/checks/cloud/nifcloud/computing/add_description_to_security_group_test.go
+++ b/checks/cloud/nifcloud/computing/add_description_to_security_group_test.go
@@ -3,12 +3,12 @@ package computing
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/computing/add_security_group_to_instance.go b/checks/cloud/nifcloud/computing/add_security_group_to_instance.go
index c3d97590..20ab5293 100755
--- a/checks/cloud/nifcloud/computing/add_security_group_to_instance.go
+++ b/checks/cloud/nifcloud/computing/add_security_group_to_instance.go
@@ -1,11 +1,11 @@
 package computing
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddSecurityGroupToInstance = rules.Register(
diff --git a/checks/cloud/nifcloud/computing/add_security_group_to_instance_test.go b/checks/cloud/nifcloud/computing/add_security_group_to_instance_test.go
index aa6a074a..10ba4957 100644
--- a/checks/cloud/nifcloud/computing/add_security_group_to_instance_test.go
+++ b/checks/cloud/nifcloud/computing/add_security_group_to_instance_test.go
@@ -3,12 +3,12 @@ package computing
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/computing/no_common_private_instance.go b/checks/cloud/nifcloud/computing/no_common_private_instance.go
index e68429b3..d7473039 100755
--- a/checks/cloud/nifcloud/computing/no_common_private_instance.go
+++ b/checks/cloud/nifcloud/computing/no_common_private_instance.go
@@ -1,11 +1,11 @@
 package computing
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoCommonPrivateInstance = rules.Register(
diff --git a/checks/cloud/nifcloud/computing/no_common_private_instance_test.go b/checks/cloud/nifcloud/computing/no_common_private_instance_test.go
index 7ece0c3b..af0ebfcb 100644
--- a/checks/cloud/nifcloud/computing/no_common_private_instance_test.go
+++ b/checks/cloud/nifcloud/computing/no_common_private_instance_test.go
@@ -3,12 +3,12 @@ package computing
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/computing/no_public_ingress_sgr.go b/checks/cloud/nifcloud/computing/no_public_ingress_sgr.go
index f9e1cd6a..211dce30 100755
--- a/checks/cloud/nifcloud/computing/no_public_ingress_sgr.go
+++ b/checks/cloud/nifcloud/computing/no_public_ingress_sgr.go
@@ -1,12 +1,12 @@
 package computing
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngressSgr = rules.Register(
diff --git a/checks/cloud/nifcloud/computing/no_public_ingress_sgr_test.go b/checks/cloud/nifcloud/computing/no_public_ingress_sgr_test.go
index 97ea9a0b..3af4bad6 100644
--- a/checks/cloud/nifcloud/computing/no_public_ingress_sgr_test.go
+++ b/checks/cloud/nifcloud/computing/no_public_ingress_sgr_test.go
@@ -3,12 +3,12 @@ package computing
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/dns/remove_verified_record.go b/checks/cloud/nifcloud/dns/remove_verified_record.go
index 6294bf64..e2efb613 100644
--- a/checks/cloud/nifcloud/dns/remove_verified_record.go
+++ b/checks/cloud/nifcloud/dns/remove_verified_record.go
@@ -1,16 +1,16 @@
 package dns
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/dns"
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/dns"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckRemoveVerifiedRecord = rules.Register(
diff --git a/checks/cloud/nifcloud/dns/remove_verified_record_test.go b/checks/cloud/nifcloud/dns/remove_verified_record_test.go
index e5cc9fa9..b7f20fd5 100644
--- a/checks/cloud/nifcloud/dns/remove_verified_record_test.go
+++ b/checks/cloud/nifcloud/dns/remove_verified_record_test.go
@@ -3,10 +3,10 @@ package dns
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/dns"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/dns"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/nifcloud/nas/add_description_to_nas_security_group.go b/checks/cloud/nifcloud/nas/add_description_to_nas_security_group.go
index faf4da41..dd8d925d 100755
--- a/checks/cloud/nifcloud/nas/add_description_to_nas_security_group.go
+++ b/checks/cloud/nifcloud/nas/add_description_to_nas_security_group.go
@@ -1,11 +1,11 @@
 package nas
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddDescriptionToNASSecurityGroup = rules.Register(
diff --git a/checks/cloud/nifcloud/nas/add_description_to_nas_security_group_test.go b/checks/cloud/nifcloud/nas/add_description_to_nas_security_group_test.go
index f47a738b..cf2db5e7 100644
--- a/checks/cloud/nifcloud/nas/add_description_to_nas_security_group_test.go
+++ b/checks/cloud/nifcloud/nas/add_description_to_nas_security_group_test.go
@@ -3,12 +3,12 @@ package nas
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/nas"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/nas"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/nas/no_common_private_nas_instance.go b/checks/cloud/nifcloud/nas/no_common_private_nas_instance.go
index 913f8fee..ade9a980 100755
--- a/checks/cloud/nifcloud/nas/no_common_private_nas_instance.go
+++ b/checks/cloud/nifcloud/nas/no_common_private_nas_instance.go
@@ -1,11 +1,11 @@
 package nas
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoCommonPrivateNASInstance = rules.Register(
diff --git a/checks/cloud/nifcloud/nas/no_common_private_nas_instance_test.go b/checks/cloud/nifcloud/nas/no_common_private_nas_instance_test.go
index c1ea16eb..da97f9ad 100644
--- a/checks/cloud/nifcloud/nas/no_common_private_nas_instance_test.go
+++ b/checks/cloud/nifcloud/nas/no_common_private_nas_instance_test.go
@@ -3,12 +3,12 @@ package nas
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/nas"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/nas"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr.go b/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr.go
index 40076d05..63650ea4 100755
--- a/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr.go
+++ b/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr.go
@@ -1,12 +1,12 @@
 package nas
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngressNASSgr = rules.Register(
diff --git a/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr_test.go b/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr_test.go
index 669be6bd..9ae934f0 100644
--- a/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr_test.go
+++ b/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr_test.go
@@ -3,12 +3,12 @@ package nas
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/nas"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/nas"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/network/add_security_group_to_router.go b/checks/cloud/nifcloud/network/add_security_group_to_router.go
index 8577d6f6..4de7eb3d 100755
--- a/checks/cloud/nifcloud/network/add_security_group_to_router.go
+++ b/checks/cloud/nifcloud/network/add_security_group_to_router.go
@@ -1,11 +1,11 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddSecurityGroupToRouter = rules.Register(
diff --git a/checks/cloud/nifcloud/network/add_security_group_to_router_test.go b/checks/cloud/nifcloud/network/add_security_group_to_router_test.go
index 77fe98db..f0b2c8b7 100644
--- a/checks/cloud/nifcloud/network/add_security_group_to_router_test.go
+++ b/checks/cloud/nifcloud/network/add_security_group_to_router_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/network"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway.go b/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway.go
index 3fc7c21d..bcda06e6 100755
--- a/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway.go
+++ b/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway.go
@@ -1,11 +1,11 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddSecurityGroupToVpnGateway = rules.Register(
diff --git a/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway_test.go b/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway_test.go
index 9f018976..dfca1767 100644
--- a/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway_test.go
+++ b/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/network"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/network/http_not_used.go b/checks/cloud/nifcloud/network/http_not_used.go
index fbe0cfa5..5e64ec8a 100755
--- a/checks/cloud/nifcloud/network/http_not_used.go
+++ b/checks/cloud/nifcloud/network/http_not_used.go
@@ -1,11 +1,11 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckHttpNotUsed = rules.Register(
diff --git a/checks/cloud/nifcloud/network/http_not_used_test.go b/checks/cloud/nifcloud/network/http_not_used_test.go
index 8df8096f..1d5fbb64 100644
--- a/checks/cloud/nifcloud/network/http_not_used_test.go
+++ b/checks/cloud/nifcloud/network/http_not_used_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/network"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/network/no_common_private_elb.go b/checks/cloud/nifcloud/network/no_common_private_elb.go
index c2f7f1d8..2fb36e55 100755
--- a/checks/cloud/nifcloud/network/no_common_private_elb.go
+++ b/checks/cloud/nifcloud/network/no_common_private_elb.go
@@ -1,11 +1,11 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoCommonPrivateElasticLoadBalancer = rules.Register(
diff --git a/checks/cloud/nifcloud/network/no_common_private_elb_test.go b/checks/cloud/nifcloud/network/no_common_private_elb_test.go
index 32e9936d..0e8d814e 100644
--- a/checks/cloud/nifcloud/network/no_common_private_elb_test.go
+++ b/checks/cloud/nifcloud/network/no_common_private_elb_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/network"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/network/no_common_private_router.go b/checks/cloud/nifcloud/network/no_common_private_router.go
index 1f8d0e95..186d057b 100755
--- a/checks/cloud/nifcloud/network/no_common_private_router.go
+++ b/checks/cloud/nifcloud/network/no_common_private_router.go
@@ -1,11 +1,11 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoCommonPrivateRouter = rules.Register(
diff --git a/checks/cloud/nifcloud/network/no_common_private_router_test.go b/checks/cloud/nifcloud/network/no_common_private_router_test.go
index c54c7114..bd271954 100644
--- a/checks/cloud/nifcloud/network/no_common_private_router_test.go
+++ b/checks/cloud/nifcloud/network/no_common_private_router_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/network"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/network/use_secure_tls_policy.go b/checks/cloud/nifcloud/network/use_secure_tls_policy.go
index fb200970..3021b308 100755
--- a/checks/cloud/nifcloud/network/use_secure_tls_policy.go
+++ b/checks/cloud/nifcloud/network/use_secure_tls_policy.go
@@ -1,11 +1,11 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var outdatedSSLPolicies = []string{
diff --git a/checks/cloud/nifcloud/network/use_secure_tls_policy_test.go b/checks/cloud/nifcloud/network/use_secure_tls_policy_test.go
index de51dc69..08b084d3 100644
--- a/checks/cloud/nifcloud/network/use_secure_tls_policy_test.go
+++ b/checks/cloud/nifcloud/network/use_secure_tls_policy_test.go
@@ -3,10 +3,10 @@ package network
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/network"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/nifcloud/rdb/add_description_to_db_security_group.go b/checks/cloud/nifcloud/rdb/add_description_to_db_security_group.go
index 96518c70..73cbebc9 100755
--- a/checks/cloud/nifcloud/rdb/add_description_to_db_security_group.go
+++ b/checks/cloud/nifcloud/rdb/add_description_to_db_security_group.go
@@ -1,11 +1,11 @@
 package rdb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckAddDescriptionToDBSecurityGroup = rules.Register(
diff --git a/checks/cloud/nifcloud/rdb/add_description_to_db_security_group_test.go b/checks/cloud/nifcloud/rdb/add_description_to_db_security_group_test.go
index c4995867..d2a23bae 100644
--- a/checks/cloud/nifcloud/rdb/add_description_to_db_security_group_test.go
+++ b/checks/cloud/nifcloud/rdb/add_description_to_db_security_group_test.go
@@ -3,12 +3,12 @@ package rdb
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/rdb"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/rdb/no_common_private_db_instance.go b/checks/cloud/nifcloud/rdb/no_common_private_db_instance.go
index 87969155..a6a362eb 100755
--- a/checks/cloud/nifcloud/rdb/no_common_private_db_instance.go
+++ b/checks/cloud/nifcloud/rdb/no_common_private_db_instance.go
@@ -1,11 +1,11 @@
 package rdb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoCommonPrivateDBInstance = rules.Register(
diff --git a/checks/cloud/nifcloud/rdb/no_common_private_db_instance_test.go b/checks/cloud/nifcloud/rdb/no_common_private_db_instance_test.go
index 54354dd5..9da7c643 100644
--- a/checks/cloud/nifcloud/rdb/no_common_private_db_instance_test.go
+++ b/checks/cloud/nifcloud/rdb/no_common_private_db_instance_test.go
@@ -3,12 +3,12 @@ package rdb
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/rdb"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/rdb/no_public_db_access.go b/checks/cloud/nifcloud/rdb/no_public_db_access.go
index b25e1ade..0e2adaa4 100755
--- a/checks/cloud/nifcloud/rdb/no_public_db_access.go
+++ b/checks/cloud/nifcloud/rdb/no_public_db_access.go
@@ -1,11 +1,11 @@
 package rdb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicDbAccess = rules.Register(
diff --git a/checks/cloud/nifcloud/rdb/no_public_db_access_test.go b/checks/cloud/nifcloud/rdb/no_public_db_access_test.go
index e50fa809..c4426a19 100644
--- a/checks/cloud/nifcloud/rdb/no_public_db_access_test.go
+++ b/checks/cloud/nifcloud/rdb/no_public_db_access_test.go
@@ -3,12 +3,12 @@ package rdb
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/rdb"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr.go b/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr.go
index 63e78aac..272de4e8 100755
--- a/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr.go
+++ b/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr.go
@@ -1,12 +1,12 @@
 package rdb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngressDBSgr = rules.Register(
diff --git a/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr_test.go b/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr_test.go
index 1e707eaa..76830def 100644
--- a/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr_test.go
+++ b/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr_test.go
@@ -3,12 +3,12 @@ package rdb
 import (
 	"testing"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/rdb"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/rdb/specify_backup_retention.go b/checks/cloud/nifcloud/rdb/specify_backup_retention.go
index a70a3be5..89070ddb 100755
--- a/checks/cloud/nifcloud/rdb/specify_backup_retention.go
+++ b/checks/cloud/nifcloud/rdb/specify_backup_retention.go
@@ -1,11 +1,11 @@
 package rdb
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckBackupRetentionSpecified = rules.Register(
diff --git a/checks/cloud/nifcloud/rdb/specify_backup_retention_test.go b/checks/cloud/nifcloud/rdb/specify_backup_retention_test.go
index fa6ef869..8bd5fd27 100644
--- a/checks/cloud/nifcloud/rdb/specify_backup_retention_test.go
+++ b/checks/cloud/nifcloud/rdb/specify_backup_retention_test.go
@@ -3,12 +3,12 @@ package rdb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/rdb"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates.go b/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates.go
index cd364582..45e5779e 100644
--- a/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates.go
+++ b/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates.go
@@ -3,15 +3,15 @@ package sslcertificate
 import (
 	"time"
 
-	"github.com/aquasecurity/defsec/pkg/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
 
-	"github.com/aquasecurity/defsec/pkg/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
 )
 
 var CheckRemoveExpiredCertificates = rules.Register(
diff --git a/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates_test.go b/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates_test.go
index 5ab3ad7e..7b27bea8 100644
--- a/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates_test.go
+++ b/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aquasecurity/defsec/pkg/providers/nifcloud/sslcertificate"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/state"
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/sslcertificate"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/checks/cloud/openstack/compute/no_plaintext_password.go b/checks/cloud/openstack/compute/no_plaintext_password.go
index c37b032a..16defcdb 100755
--- a/checks/cloud/openstack/compute/no_plaintext_password.go
+++ b/checks/cloud/openstack/compute/no_plaintext_password.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPlaintextPassword = rules.Register(
diff --git a/checks/cloud/openstack/compute/no_plaintext_password_test.go b/checks/cloud/openstack/compute/no_plaintext_password_test.go
index 835c2395..c318df2e 100644
--- a/checks/cloud/openstack/compute/no_plaintext_password_test.go
+++ b/checks/cloud/openstack/compute/no_plaintext_password_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/openstack"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/openstack"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/openstack/compute/no_public_access.go b/checks/cloud/openstack/compute/no_public_access.go
index 9a6a36ce..85c6a452 100755
--- a/checks/cloud/openstack/compute/no_public_access.go
+++ b/checks/cloud/openstack/compute/no_public_access.go
@@ -1,12 +1,12 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicAccess = rules.Register(
diff --git a/checks/cloud/openstack/compute/no_public_access_test.go b/checks/cloud/openstack/compute/no_public_access_test.go
index 955c1f84..7e098f14 100644
--- a/checks/cloud/openstack/compute/no_public_access_test.go
+++ b/checks/cloud/openstack/compute/no_public_access_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/openstack"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/openstack"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/openstack/networking/add_description_to_security_group.go b/checks/cloud/openstack/networking/add_description_to_security_group.go
index 5d2c45a5..f420bd94 100755
--- a/checks/cloud/openstack/networking/add_description_to_security_group.go
+++ b/checks/cloud/openstack/networking/add_description_to_security_group.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckSecurityGroupHasDescription = rules.Register(
diff --git a/checks/cloud/openstack/networking/add_description_to_security_group_test.go b/checks/cloud/openstack/networking/add_description_to_security_group_test.go
index 22661418..7413a2b0 100644
--- a/checks/cloud/openstack/networking/add_description_to_security_group_test.go
+++ b/checks/cloud/openstack/networking/add_description_to_security_group_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/openstack"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/openstack"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/openstack/networking/no_public_egress.go b/checks/cloud/openstack/networking/no_public_egress.go
index 732ec91d..3ce4cbd9 100755
--- a/checks/cloud/openstack/networking/no_public_egress.go
+++ b/checks/cloud/openstack/networking/no_public_egress.go
@@ -1,12 +1,12 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicEgress = rules.Register(
diff --git a/checks/cloud/openstack/networking/no_public_egress_test.go b/checks/cloud/openstack/networking/no_public_egress_test.go
index 360f6330..9f503a60 100644
--- a/checks/cloud/openstack/networking/no_public_egress_test.go
+++ b/checks/cloud/openstack/networking/no_public_egress_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/openstack"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/openstack"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/openstack/networking/no_public_ingress.go b/checks/cloud/openstack/networking/no_public_ingress.go
index fcdb14be..a82a5c5e 100755
--- a/checks/cloud/openstack/networking/no_public_ingress.go
+++ b/checks/cloud/openstack/networking/no_public_ingress.go
@@ -1,12 +1,12 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngress = rules.Register(
diff --git a/checks/cloud/openstack/networking/no_public_ingress_test.go b/checks/cloud/openstack/networking/no_public_ingress_test.go
index 4229bdc0..b3a29bd9 100644
--- a/checks/cloud/openstack/networking/no_public_ingress_test.go
+++ b/checks/cloud/openstack/networking/no_public_ingress_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/openstack"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/openstack"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/cloud/oracle/compute/no_public_ip.go b/checks/cloud/oracle/compute/no_public_ip.go
index 208e9b2f..c8c3d140 100755
--- a/checks/cloud/oracle/compute/no_public_ip.go
+++ b/checks/cloud/oracle/compute/no_public_ip.go
@@ -1,11 +1,11 @@
 package compute
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIp = rules.Register(
diff --git a/checks/cloud/oracle/compute/no_public_ip_test.go b/checks/cloud/oracle/compute/no_public_ip_test.go
index 2d763d4f..a8fd8b4f 100644
--- a/checks/cloud/oracle/compute/no_public_ip_test.go
+++ b/checks/cloud/oracle/compute/no_public_ip_test.go
@@ -3,12 +3,12 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/oracle"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/oracle"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/kubernetes/network/no_public_egress.go b/checks/kubernetes/network/no_public_egress.go
index d604dc6e..e4e8f84f 100755
--- a/checks/kubernetes/network/no_public_egress.go
+++ b/checks/kubernetes/network/no_public_egress.go
@@ -1,12 +1,12 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicEgress = rules.Register(
diff --git a/checks/kubernetes/network/no_public_egress_test.go b/checks/kubernetes/network/no_public_egress_test.go
index 18f06294..72f815e9 100644
--- a/checks/kubernetes/network/no_public_egress_test.go
+++ b/checks/kubernetes/network/no_public_egress_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/kubernetes"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/kubernetes"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/checks/kubernetes/network/no_public_ingress.go b/checks/kubernetes/network/no_public_ingress.go
index 41dd8b89..26f35958 100755
--- a/checks/kubernetes/network/no_public_ingress.go
+++ b/checks/kubernetes/network/no_public_ingress.go
@@ -1,12 +1,12 @@
 package network
 
 import (
-	"github.com/aquasecurity/defsec/pkg/providers"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/severity"
-	"github.com/aquasecurity/defsec/pkg/state"
 	"github.com/aquasecurity/trivy-policies/internal/cidr"
 	"github.com/aquasecurity/trivy-policies/pkg/rules"
+	"github.com/aquasecurity/trivy/pkg/iac/providers"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/severity"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 var CheckNoPublicIngress = rules.Register(
diff --git a/checks/kubernetes/network/no_public_ingress_test.go b/checks/kubernetes/network/no_public_ingress_test.go
index 8afcbcf0..7a5baf8e 100644
--- a/checks/kubernetes/network/no_public_ingress_test.go
+++ b/checks/kubernetes/network/no_public_ingress_test.go
@@ -3,12 +3,12 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
-	"github.com/aquasecurity/defsec/pkg/state"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 
-	"github.com/aquasecurity/defsec/pkg/providers/kubernetes"
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/kubernetes"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/cmd/id/main.go b/cmd/id/main.go
index bab0713a..c3376249 100644
--- a/cmd/id/main.go
+++ b/cmd/id/main.go
@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	"github.com/aquasecurity/trivy/pkg/iac/framework"
-
 	_ "github.com/aquasecurity/trivy/pkg/iac/rego"
 	"github.com/aquasecurity/trivy/pkg/iac/rules"
 )
diff --git a/go.mod b/go.mod
index 571def90..f0d69c18 100644
--- a/go.mod
+++ b/go.mod
@@ -1,17 +1,18 @@
 module github.com/aquasecurity/trivy-policies
 
-go 1.20
+go 1.21
+
+require github.com/aquasecurity/trivy v0.49.2-0.20240220065143-82214736a943
 
 require (
-	github.com/aquasecurity/defsec v0.94.1
 	github.com/docker/docker v25.0.2+incompatible
 	github.com/liamg/iamgo v0.0.9
 	github.com/liamg/memoryfs v1.6.0
-	github.com/open-policy-agent/opa v0.60.0
+	github.com/open-policy-agent/opa v0.61.0
 	github.com/owenrumney/squealer v1.2.1
-	github.com/stretchr/testify v1.8.4
 	github.com/testcontainers/testcontainers-go v0.27.0
 	gopkg.in/yaml.v3 v3.0.1
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
@@ -21,7 +22,7 @@ require (
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/Microsoft/hcsshim v0.11.4 // indirect
 	github.com/OneOfOne/xxhash v1.2.8 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/agnivade/levenshtein v1.1.1 // indirect
 	github.com/alecthomas/chroma v0.10.0 // indirect
@@ -33,18 +34,18 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/containerd/containerd v1.7.11 // indirect
+	github.com/containerd/containerd v1.7.12 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgraph-io/badger/v3 v3.2103.5 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
 	github.com/distribution/reference v0.5.0 // indirect
 	github.com/dlclark/regexp2 v1.4.0 // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -52,7 +53,7 @@ require (
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/go-git/go-git/v5 v5.11.0 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
@@ -62,19 +63,19 @@ require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/flatbuffers v1.12.1 // indirect
-	github.com/google/uuid v1.5.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
 	github.com/hashicorp/hcl/v2 v2.19.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/compress v1.16.6 // indirect
+	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/liamg/jfather v0.0.7 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/locker v1.0.1 // indirect
@@ -85,17 +86,18 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
 	github.com/peterh/liner v1.2.2 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/prometheus/client_golang v1.16.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/client_golang v1.18.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/shirou/gopsutil/v3 v3.23.11 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
@@ -114,27 +116,27 @@ require (
 	github.com/zclconf/go-cty v1.13.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
-	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/otel v1.23.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
-	go.opentelemetry.io/otel/metric v1.21.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
-	go.opentelemetry.io/otel/trace v1.21.0 // indirect
+	go.opentelemetry.io/otel/metric v1.23.1 // indirect
+	go.opentelemetry.io/otel/sdk v1.23.1 // indirect
+	go.opentelemetry.io/otel/trace v1.23.1 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/automaxprocs v1.5.3 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
-	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.13.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
-	google.golang.org/grpc v1.60.1 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/tools v0.16.1 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/grpc v1.61.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	oras.land/oras-go/v2 v2.3.1 // indirect
diff --git a/go.sum b/go.sum
index eea2a94e..c55cd958 100644
--- a/go.sum
+++ b/go.sum
@@ -14,8 +14,8 @@ github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYx
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
 github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
-github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg=
-github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
+github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c h1:kMFnB0vCcX7IL/m9Y5LO+KQYv+t1CQOiFe6+SV2J7bE=
+github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
 github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
 github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=
@@ -23,16 +23,18 @@ github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVb
 github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
 github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
-github.com/aquasecurity/defsec v0.94.1 h1:lk44bfUltm0f0Dw4DbO3Ka9d/bf3N8cWclSdHXMyKF4=
-github.com/aquasecurity/defsec v0.94.1/go.mod h1:wiX9BX0SOG0ZWjVIPYGPl46fyO3Gu8lJnk4rmhFR7IA=
+github.com/aquasecurity/trivy v0.49.2-0.20240220065143-82214736a943 h1:DOc7rJMyi2cEfExJPft6Leuv1h54D3APq/+fJCpcKg0=
+github.com/aquasecurity/trivy v0.49.2-0.20240220065143-82214736a943/go.mod h1:ilJlwPnmG6sPoEQ9ZYZgwNpKAFxn1zjYkYjCR3ptGDk=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
@@ -52,9 +54,11 @@ github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vc
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
-github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw=
-github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE=
+github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
+github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0=
+github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk=
 github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
+github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -65,17 +69,20 @@ github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHf
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgraph-io/badger/v3 v3.2103.5 h1:ylPa6qzbjYRQMU6jokoj4wzcaweHylt//CH0AKt0akg=
 github.com/dgraph-io/badger/v3 v3.2103.5/go.mod h1:4MPiseMeDQ3FNCYwRbbcBOGJLf5jsE0PPFzRiKjtcdw=
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
+github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
 github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
@@ -84,13 +91,15 @@ github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/docker/docker v25.0.2+incompatible h1:/OaKeauroa10K4Nqavw4zlhcDq/WBcPMc5DbjOGgozY=
 github.com/docker/docker v25.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
+github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
+github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -100,28 +109,33 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/foxcpp/go-mockdns v1.0.0 h1:7jBqxd3WDWwi/6WhDvacvH1XsN3rOLXyHM1uhvIx6FI=
+github.com/foxcpp/go-mockdns v1.0.0/go.mod h1:lgRN6+KxQBawyIghpnl5CezHFGS9VLzvtVlwxvzXTQ4=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
+github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
 github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
 github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
 github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4=
 github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY=
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
+github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
+github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -165,8 +179,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
@@ -184,14 +198,17 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
-github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
+github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/liamg/iamgo v0.0.9 h1:tADGm3xVotyRJmuKKaH4+zsBn7LOcvgdpuF3WsSKW3c=
 github.com/liamg/iamgo v0.0.9/go.mod h1:Kk6ZxBF/GQqG9nnaUjIi6jf+WXNpeOTyhwc6gnguaZQ=
 github.com/liamg/jfather v0.0.7 h1:Xf78zS263yfT+xr2VSo6+kyAy4ROlCacRqJG7s5jt4k=
@@ -204,11 +221,13 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
+github.com/miekg/dns v1.1.53 h1:ZBkuHr5dxHtB1caEOlZTLPo7D3L3TWckgUUs/RHfDxw=
+github.com/miekg/dns v1.1.53/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
 github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
@@ -220,6 +239,7 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ
 github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
 github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
+github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
 github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
 github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg=
@@ -231,12 +251,13 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
-github.com/open-policy-agent/opa v0.60.0 h1:ZPoPt4yeNs5UXCpd/P/btpSyR8CR0wfhVoh9BOwgJNs=
-github.com/open-policy-agent/opa v0.60.0/go.mod h1:aD5IK6AiLNYBjNXn7E02++yC8l4Z+bRDvgM6Ss0bBzA=
+github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
+github.com/open-policy-agent/opa v0.61.0 h1:nhncQ2CAYtQTV/SMBhDDPsCpCQsUW+zO/1j+T5V7oZg=
+github.com/open-policy-agent/opa v0.61.0/go.mod h1:7OUuzJnsS9yHf8lw0ApfcbrnaRG1EkN3J2fuuqi4G/E=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
-github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
+github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU=
+github.com/opencontainers/image-spec v1.1.0-rc6/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
 github.com/owenrumney/squealer v1.2.1 h1:4ryMMT59aaz8VMsqsD+FDkarADJz0F1dcq2fd0DRR+c=
 github.com/owenrumney/squealer v1.2.1/go.mod h1:7D0a/+Bouwy504YhaWsBYW73kyklSEq1MNf6zsNoTRg=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -246,23 +267,28 @@ github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
-github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
+github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
+github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
-github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
-github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
-github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
-github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
-github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
+github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
+github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
@@ -332,24 +358,26 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo=
-go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
-go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
+go.opentelemetry.io/otel v1.23.1 h1:Za4UzOqJYS+MUczKI320AtqZHZb7EqxO00jAHE0jmQY=
+go.opentelemetry.io/otel v1.23.1/go.mod h1:Td0134eafDLcTS4y+zQ26GE8u3dEuRBiBCTUIRHaikA=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
-go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
-go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
-go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
-go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
-go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
-go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
+go.opentelemetry.io/otel/metric v1.23.1 h1:PQJmqJ9u2QaJLBOELl1cxIdPcpbwzbkjfEyelTl2rlo=
+go.opentelemetry.io/otel/metric v1.23.1/go.mod h1:mpG2QPlAfnK8yNhNJAxDZruU9Y1/HubbC+KyH8FaCWI=
+go.opentelemetry.io/otel/sdk v1.23.1 h1:O7JmZw0h76if63LQdsBMKQDWNb5oEcOThG9IrxscV+E=
+go.opentelemetry.io/otel/sdk v1.23.1/go.mod h1:LzdEVR5am1uKOOwfBWFef2DCi1nu3SA8XQxx2IerWFk=
+go.opentelemetry.io/otel/trace v1.23.1 h1:4LrmmEd8AU2rFvU1zegmvqW7+kWarxtNOPyeL6HmYY8=
+go.opentelemetry.io/otel/trace v1.23.1/go.mod h1:4IpnpJFwr1mo/6HL8XIPJaE9y0+u1KcVmuW7dwFSVrI=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
 go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -361,8 +389,8 @@ golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU
 golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
 golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
+golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -370,8 +398,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -392,7 +420,6 @@ golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -435,6 +462,7 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -456,8 +484,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
+golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -468,19 +496,20 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0=
-google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU=
-google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 h1:6GQBEOdGkX6MMTLT9V+TjtIRZCw9VPD5Z+yHY9wMgS0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY=
+google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ=
+google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
+google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo=
+google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
-google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
+google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0=
+google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -492,11 +521,12 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -506,6 +536,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
+gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 oras.land/oras-go/v2 v2.3.1 h1:lUC6q8RkeRReANEERLfH86iwGn55lbSWP20egdFHVec=
diff --git a/pkg/rules/rules.go b/pkg/rules/rules.go
index dd6b9a5f..5ee22e12 100644
--- a/pkg/rules/rules.go
+++ b/pkg/rules/rules.go
@@ -1,7 +1,7 @@
 package rules
 
 import (
-	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/trivy/pkg/iac/scan"
 )
 
 var rules []scan.Rule

From 67b2680943886db860cafcd5c563bc30113b4051 Mon Sep 17 00:00:00 2001
From: Simar <simar@linux.com>
Date: Tue, 20 Feb 2024 22:52:47 -0700
Subject: [PATCH 3/4] go mod tidy

---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index f0d69c18..b83ad118 100644
--- a/go.mod
+++ b/go.mod
@@ -10,9 +10,9 @@ require (
 	github.com/liamg/memoryfs v1.6.0
 	github.com/open-policy-agent/opa v0.61.0
 	github.com/owenrumney/squealer v1.2.1
+	github.com/stretchr/testify v1.8.4
 	github.com/testcontainers/testcontainers-go v0.27.0
 	gopkg.in/yaml.v3 v3.0.1
-	github.com/stretchr/testify v1.8.4
 )
 
 require (

From 4aabcecf4a45ac4133beff21b6b8d5f308ab2051 Mon Sep 17 00:00:00 2001
From: Simar <simar@linux.com>
Date: Tue, 20 Feb 2024 23:02:44 -0700
Subject: [PATCH 4/4] s/defsecTypes/trivyTypes/g

---
 .../accessanalyzer/enable_access_analyzer.go  |   6 +-
 .../enable_access_analyzer_test.go            |  18 +--
 .../apigateway/enable_access_logging_test.go  |  18 +--
 .../enable_cache_encryption_test.go           |  32 ++--
 .../cloud/aws/apigateway/enable_cache_test.go |  18 +--
 .../aws/apigateway/enable_tracing_test.go     |  14 +-
 .../aws/apigateway/no_public_access_test.go   |  32 ++--
 .../apigateway/use_secure_tls_policy_test.go  |  10 +-
 .../athena/enable_at_rest_encryption_test.go  |  26 +--
 .../aws/athena/no_encryption_override_test.go |  10 +-
 .../aws/cloudfront/enable_logging_test.go     |  14 +-
 .../cloud/aws/cloudfront/enable_waf_test.go   |  10 +-
 .../aws/cloudfront/enforce_https_test.go      |  28 ++--
 .../cloudfront/use_secure_tls_policy_test.go  |  32 ++--
 .../aws/cloudtrail/enable_all_regions_test.go |  10 +-
 .../enable_at_rest_encryption_test.go         |  10 +-
 .../cloudtrail/enable_log_validation_test.go  |  10 +-
 .../ensure_cloudwatch_integration_test.go     |  10 +-
 .../cloudtrail/no_public_log_access_test.go   |  22 +--
 .../require_bucket_access_logging_test.go     |  26 +--
 .../cloudwatch/log_group_customer_key_test.go |  10 +-
 .../require_cloudtrail_change_alarm_test.go   |  46 +++---
 .../require_cmk_disabled_alarm_test.go        |  46 +++---
 ..._config_configuration_change_alarm_test.go |  46 +++---
 ...equire_console_login_failure_alarm_test.go |  46 +++---
 .../require_iam_policy_change_alarm_test.go   |  48 +++---
 .../require_nacl_change_alarm_test.go         |  48 +++---
 ...quire_network_gateway_change_alarm_test.go |  48 +++---
 .../require_non_mfa_login_alarm_test.go       |  48 +++---
 .../require_org_changes_alarm_test.go         |  44 +++---
 .../require_root_user_usage_alarm_test.go     |  52 +++---
 .../require_route_table_change_alarm_test.go  |  48 +++---
 ...uire_s3_bucket_policy_change_alarm_test.go |  48 +++---
 ...equire_security_group_change_alarm_test.go |  48 +++---
 ...equire_unauthorised_api_call_alarm_test.go |  46 +++---
 .../require_vpc_change_alarm_test.go          |  48 +++---
 .../aws/codebuild/enable_encryption_test.go   |  28 ++--
 .../aws/config/aggregate_all_regions_test.go  |  10 +-
 .../aws/documentdb/enable_log_export_test.go  |  20 +--
 .../enable_storage_encryption_test.go         |  10 +-
 .../encryption_customer_key_test.go           |  22 +--
 .../enable_at_rest_encryption_test.go         |  14 +-
 .../aws/dynamodb/enable_recovery_test.go      |  10 +-
 .../aws/dynamodb/table_customer_key_test.go   |  34 ++--
 ...description_to_security_group_rule_test.go |  14 +-
 .../add_description_to_security_group_test.go |  14 +-
 .../ec2/as_enable_at_rest_encryption_test.go  |  24 +--
 .../ec2/as_enforce_http_token_imds_test.go    |  28 ++--
 .../ec2/as_no_secrets_in_user_data_test.go    |  18 +--
 .../aws/ec2/enable_at_rest_encryption_test.go |   6 +-
 .../aws/ec2/enable_volume_encryption_test.go  |  14 +-
 .../aws/ec2/encryption_customer_key_test.go   |  14 +-
 .../aws/ec2/enforce_http_token_imds_test.go   |  18 +--
 .../aws/ec2/no_excessive_port_access_test.go  |  28 ++--
 .../aws/ec2/no_public_egress_sgr_test.go      |  18 +--
 .../aws/ec2/no_public_ingress_acl_test.go     |  26 +--
 .../aws/ec2/no_public_ingress_sgr_test.go     |  18 +--
 .../cloud/aws/ec2/no_public_ip_subnet_test.go |  10 +-
 checks/cloud/aws/ec2/no_public_ip_test.go     |  10 +-
 .../aws/ec2/no_secrets_in_user_data_test.go   |  14 +-
 .../cloud/aws/ec2/no_sensitive_info_test.go   |  14 +-
 ...require_vpc_flow_logs_for_all_vpcs_test.go |  14 +-
 .../cloud/aws/ecr/enable_image_scans_test.go  |  14 +-
 .../ecr/enforce_immutable_repository_test.go  |  10 +-
 .../aws/ecr/repository_customer_key_test.go   |  24 +--
 .../aws/ecs/enable_container_insight_test.go  |  14 +-
 .../ecs/enable_in_transit_encryption_test.go  |  18 +--
 .../aws/ecs/no_plaintext_secrets_test.go      |  30 ++--
 .../aws/efs/enable_at_rest_encryption_test.go |  10 +-
 .../eks/enable_control_plane_logging_test.go  |  38 ++---
 checks/cloud/aws/eks/encrypt_secrets_test.go  |  26 +--
 .../aws/eks/no_public_cluster_access_test.go  |   6 +-
 .../no_public_cluster_access_to_cidr_test.go  |  20 +--
 ...add_description_for_security_group_test.go |  10 +-
 .../enable_at_rest_encryption_test.go         |  10 +-
 .../enable_backup_retention_test.go           |  18 +--
 .../enable_in_transit_encryption_test.go      |  10 +-
 .../enable_domain_encryption_test.go          |  14 +-
 .../enable_domain_logging_test.go             |  14 +-
 .../enable_in_transit_encryption_test.go      |  14 +-
 .../aws/elasticsearch/enforce_https_test.go   |  14 +-
 .../use_secure_tls_policy_test.go             |  14 +-
 checks/cloud/aws/elb/alb_not_public_test.go   |  14 +-
 .../aws/elb/drop_invalid_headers_test.go      |  18 +--
 checks/cloud/aws/elb/http_not_used_test.go    |  54 +++----
 .../aws/elb/use_secure_tls_policy_test.go     |  20 +--
 .../aws/emr/enable_at_rest_encryption_test.go |  14 +-
 .../emr/enable_in_transit_encryption_test.go  |  14 +-
 .../emr/enable_local_disk_encryption_test.go  |  14 +-
 .../iam/disable_unused_credentials_45_test.go |  62 ++++----
 .../iam/disable_unused_credentials_test.go    |  62 ++++----
 checks/cloud/aws/iam/enforce_root_mfa_test.go |  18 +--
 checks/cloud/aws/iam/enforce_user_mfa_test.go |  22 +--
 .../aws/iam/limit_root_account_usage_test.go  |  26 +--
 .../aws/iam/limit_user_access_keys_test.go    |  96 ++++++------
 .../cloud/aws/iam/no_password_reuse_test.go   |  10 +-
 .../cloud/aws/iam/no_policy_wildcards_test.go |  66 ++++----
 .../cloud/aws/iam/no_root_access_keys_test.go |  52 +++---
 .../aws/iam/no_user_attached_policies_test.go |  16 +-
 .../iam/remove_expired_certificates_test.go   |  10 +-
 .../require_lowercase_in_passwords_test.go    |  10 +-
 .../iam/require_numbers_in_passwords_test.go  |  10 +-
 checks/cloud/aws/iam/require_support_role.go  |   4 +-
 .../aws/iam/require_support_role_test.go      |  12 +-
 .../iam/require_symbols_in_passwords_test.go  |  10 +-
 .../require_uppercase_in_passwords_test.go    |  10 +-
 .../cloud/aws/iam/rotate_access_keys_test.go  |  34 ++--
 .../aws/iam/set_max_password_age_test.go      |  10 +-
 .../iam/set_minimum_password_length_test.go   |  10 +-
 .../enable_in_transit_encryption_test.go      |  26 +--
 checks/cloud/aws/kms/auto_rotate_keys_test.go |  14 +-
 .../cloud/aws/lambda/enable_tracing_test.go   |  14 +-
 .../aws/lambda/restrict_source_arn_test.go    |  18 +--
 .../cloud/aws/mq/enable_audit_logging_test.go |  14 +-
 .../aws/mq/enable_general_logging_test.go     |  14 +-
 checks/cloud/aws/mq/no_public_access_test.go  |  10 +-
 .../aws/msk/enable_at_rest_encryption_test.go |  12 +-
 .../msk/enable_in_transit_encryption_test.go  |  20 +--
 checks/cloud/aws/msk/enable_logging_test.go   |  38 ++---
 .../aws/neptune/enable_log_export_test.go     |  14 +-
 .../neptune/enable_storage_encryption_test.go |  10 +-
 .../neptune/encryption_customer_key_test.go   |  10 +-
 .../rds/enable_performance_insights_test.go   |  18 +--
 .../rds/encrypt_cluster_storage_data_test.go  |  26 +--
 .../rds/encrypt_instance_storage_data_test.go |  18 +--
 ...e_insights_encryption_customer_key_test.go |  28 ++--
 .../aws/rds/specify_backup_retention_test.go  |  26 +--
 .../add_description_to_security_group_test.go |  10 +-
 .../redshift/encryption_customer_key_test.go  |  26 +--
 checks/cloud/aws/redshift/use_vpc_test.go     |  10 +-
 checks/cloud/aws/s3/block_public_acls_test.go |  10 +-
 .../cloud/aws/s3/block_public_policy_test.go  |  10 +-
 .../aws/s3/enable_bucket_encryption_test.go   |  14 +-
 .../aws/s3/enable_object_read_logging_test.go | 114 +++++++-------
 .../s3/enable_object_write_logging_test.go    | 114 +++++++-------
 checks/cloud/aws/s3/enable_versioning_test.go |  14 +-
 .../aws/s3/encryption_customer_key_test.go    |  18 +--
 .../cloud/aws/s3/ignore_public_acls_test.go   |  10 +-
 .../aws/s3/no_public_access_with_acl_test.go  |  10 +-
 checks/cloud/aws/s3/no_public_buckets_test.go |  10 +-
 .../cloud/aws/s3/require_mfa_delete_test.go   |  26 +--
 .../aws/sam/api_use_secure_tls_policy_test.go |  14 +-
 .../aws/sam/enable_api_access_logging_test.go |  14 +-
 .../sam/enable_api_cache_encryption_test.go   |  14 +-
 .../cloud/aws/sam/enable_api_tracing_test.go  |  10 +-
 .../aws/sam/enable_function_tracing_test.go   |  10 +-
 .../enable_http_api_access_logging_test.go    |  14 +-
 .../sam/enable_state_machine_logging_test.go  |  14 +-
 .../sam/enable_state_machine_tracing_test.go  |  14 +-
 .../aws/sam/enable_table_encryption_test.go   |  14 +-
 .../aws/sns/enable_topic_encryption_test.go   |  20 +--
 .../aws/sns/topic_encryption_with_cmk_test.go |  20 +--
 .../aws/sqs/enable_queue_encryption_test.go   |  34 ++--
 .../aws/sqs/queue_encryption_with_cmk_test.go |  20 +--
 .../aws/ssm/secret_use_customer_key_test.go   |  14 +-
 .../workspaces/enable_disk_encryption_test.go |  44 +++---
 .../account_identity_registered_test.go       |  14 +-
 .../appservice/authentication_enabled_test.go |  14 +-
 .../azure/appservice/enable_http2_test.go     |  18 +--
 .../azure/appservice/enforce_https_test.go    |  10 +-
 .../appservice/require_client_cert_test.go    |  10 +-
 .../appservice/use_secure_tls_policy_test.go  |  22 +--
 .../authorization/limit_role_actions_test.go  |  26 +--
 .../disable_password_authentication_test.go   |  14 +-
 .../compute/enable_disk_encryption_test.go    |  14 +-
 .../compute/no_secrets_in_custom_data_test.go |  14 +-
 .../configured_network_policy_test.go         |  14 +-
 .../container/limit_authorized_ips_test.go    |  16 +-
 checks/cloud/azure/container/logging_test.go  |  18 +--
 .../container/use_rbac_permissions_test.go    |  14 +-
 .../all_threat_alerts_enabled_test.go         |  16 +-
 .../cloud/azure/database/enable_audit_test.go |  10 +-
 .../database/enable_ssl_enforcement_test.go   |  38 ++---
 .../azure/database/no_public_access_test.go   |  50 +++---
 .../no_public_firewall_access_test.go         |  92 +++++------
 ...onfiguration_connection_throttling_test.go |  14 +-
 ...gres_configuration_log_checkpoints_test.go |  14 +-
 ...gres_configuration_log_connections_test.go |  14 +-
 .../database/retention_period_set_test.go     |  14 +-
 .../azure/database/secure_tls_policy_test.go  |  38 ++---
 .../database/threat_alert_email_set_test.go   |  16 +-
 .../threat_alert_email_to_owner_test.go       |  14 +-
 .../datafactory/no_public_access_test.go      |  10 +-
 .../enable_at_rest_encryption_test.go         |  10 +-
 .../keyvault/content_type_for_secret_test.go  |  14 +-
 .../azure/keyvault/ensure_key_expiry_test.go  |  14 +-
 .../keyvault/ensure_secret_expiry_test.go     |  14 +-
 checks/cloud/azure/keyvault/no_purge_test.go  |  20 +--
 .../keyvault/specify_network_acl_test.go      |  14 +-
 .../activity_log_retention_set_test.go        |  26 +--
 .../monitor/capture_all_activities_test.go    |  18 +--
 .../azure/monitor/capture_all_regions_test.go | 148 +++++++++---------
 .../network/disable_rdp_from_internet_test.go |  50 +++---
 .../azure/network/no_public_egress_test.go    |  26 +--
 .../azure/network/no_public_ingress_test.go   |  26 +--
 .../network/retention_policy_set_test.go      |  26 +--
 .../network/ssh_blocked_from_internet_test.go |  50 +++---
 .../alert_on_severe_notifications_test.go     |  10 +-
 .../enable_standard_subscription_test.go      |  10 +-
 .../set_required_contact_details_test.go      |  10 +-
 .../allow_microsoft_service_bypass_test.go    |  16 +-
 .../azure/storage/default_action_deny_test.go |  14 +-
 .../cloud/azure/storage/enforce_https_test.go |  10 +-
 .../azure/storage/no_public_access_test.go    |  20 +--
 .../queue_services_logging_enabled_test.go    |  24 +--
 .../storage/use_secure_tls_policy_test.go     |  12 +-
 .../synapse/virtual_network_enabled_test.go   |  10 +-
 .../compute/no_sensitive_info_test.go         |  10 +-
 ...auto_upgrade_no_maintenance_policy_test.go |  10 +-
 .../compute/enforce_https_test.go             |  22 +--
 .../compute/kubernetes_surge_upgrades_test.go |  10 +-
 .../compute/no_public_egress_test.go          |  20 +--
 .../compute/no_public_ingress_test.go         |  20 +--
 .../digitalocean/compute/use_ssh_keys_test.go |  12 +-
 .../spaces/acl_no_public_read_test.go         |  22 +--
 .../spaces/disable_force_destroy_test.go      |  10 +-
 .../spaces/versioning_enabled_test.go         |  14 +-
 .../no_plain_text_action_secrets_test.go      |  10 +-
 .../require_signed_commits_test.go            |  10 +-
 .../enable_vulnerability_alerts_test.go       |  20 +--
 .../cloud/github/repositories/private_test.go |  10 +-
 .../google/bigquery/no_public_access_test.go  |  14 +-
 .../disk_encryption_customer_key_test.go      |  14 +-
 .../disk_encryption_no_plaintext_key_test.go  |  36 ++---
 .../compute/enable_shielded_vm_im_test.go     |  14 +-
 .../compute/enable_shielded_vm_sb_test.go     |  14 +-
 .../compute/enable_shielded_vm_vtpm_test.go   |  14 +-
 .../compute/enable_vpc_flow_logs_test.go      |  22 +--
 .../no_default_service_account_test.go        |  26 +--
 .../google/compute/no_ip_forwarding_test.go   |  10 +-
 .../compute/no_oslogin_override_test.go       |  10 +-
 .../compute/no_project_wide_ssh_keys_test.go  |  10 +-
 .../google/compute/no_public_egress_test.go   |  36 ++---
 .../google/compute/no_public_ingress_test.go  |  36 ++---
 .../cloud/google/compute/no_public_ip_test.go |  14 +-
 .../google/compute/no_serial_port_test.go     |  10 +-
 .../compute/project_level_oslogin_test.go     |  10 +-
 .../compute/use_secure_tls_policy_test.go     |  10 +-
 .../vm_disk_encryption_customer_key_test.go   |  18 +--
 checks/cloud/google/dns/enable_dnssec_test.go |  26 +--
 checks/cloud/google/dns/no_rsa_sha1_test.go   |  34 ++--
 .../google/gke/enable_auto_repair_test.go     |  18 +--
 .../google/gke/enable_auto_upgrade_test.go    |  18 +--
 .../google/gke/enable_ip_aliasing_test.go     |  14 +-
 .../google/gke/enable_master_networks_test.go |  14 +-
 .../google/gke/enable_network_policy_test.go  |  30 ++--
 .../google/gke/enable_private_cluster_test.go |  14 +-
 .../gke/enable_stackdriver_logging_test.go    |  10 +-
 .../gke/enable_stackdriver_monitoring_test.go |  10 +-
 .../gke/metadata_endpoints_disabled_test.go   |  42 ++---
 .../gke/no_legacy_authentication_test.go      |  30 ++--
 .../gke/no_public_control_plane_test.go       |  18 +--
 .../google/gke/node_metadata_security_test.go |  34 ++--
 .../google/gke/node_pool_uses_cos_test.go     |  26 +--
 .../google/gke/node_shielding_enabled_test.go |  10 +-
 .../google/gke/use_cluster_labels_test.go     |  12 +-
 .../google/gke/use_rbac_permissions_test.go   |  10 +-
 .../google/gke/use_service_account_test.go    |  18 +--
 ...on_workload_identity_pool_provider_test.go |  24 +--
 .../google/iam/no_default_network_test.go     |  28 ++--
 ...default_service_account_assignment_test.go |  52 +++---
 ...evel_service_account_impersonation_test.go |  34 ++--
 ...default_service_account_assignment_test.go |  36 ++---
 ...evel_service_account_impersonation_test.go |  24 +--
 .../no_privileged_service_accounts_test.go    |  44 +++---
 ...default_service_account_assignment_test.go |  38 ++---
 ...evel_service_account_impersonation_test.go |  30 ++--
 .../iam/no_user_granted_permissions_test.go   |  76 ++++-----
 .../cloud/google/kms/rotate_kms_keys_test.go  |  14 +-
 checks/cloud/google/sql/enable_backup_test.go |  32 ++--
 .../sql/enable_pg_temp_file_logging_test.go   |  32 ++--
 .../sql/encrypt_in_transit_data_test.go       |  18 +--
 .../google/sql/mysql_no_local_infile_test.go  |  22 +--
 .../google/sql/no_contained_db_auth_test.go   |  22 +--
 .../no_cross_db_ownership_chaining_test.go    |  22 +--
 .../cloud/google/sql/no_public_access_test.go |  38 ++---
 .../google/sql/pg_log_checkpoints_test.go     |  22 +--
 .../google/sql/pg_log_connections_test.go     |  22 +--
 .../google/sql/pg_log_disconnections_test.go  |  22 +--
 checks/cloud/google/sql/pg_log_errors_test.go |  22 +--
 .../google/sql/pg_log_lock_waits_test.go      |  22 +--
 .../sql/pg_no_min_statement_logging_test.go   |  22 +--
 .../bucket_encryption_customer_test.go        |  14 +-
 .../cloud/google/storage/enable_ubla_test.go  |  10 +-
 .../google/storage/no_public_access_test.go   |  28 ++--
 ...description_to_security_group_rule_test.go |  14 +-
 .../add_description_to_security_group_test.go |  14 +-
 .../add_security_group_to_instance_test.go    |  10 +-
 .../no_common_private_instance_test.go        |  14 +-
 .../computing/no_public_ingress_sgr_test.go   |  14 +-
 .../dns/remove_verified_record_test.go        |  20 +--
 ..._description_to_nas_security_group_test.go |  14 +-
 .../no_common_private_nas_instance_test.go    |  10 +-
 .../nas/no_public_ingress_nas_sgr_test.go     |  14 +-
 .../add_security_group_to_router_test.go      |  10 +-
 .../add_security_group_to_vpn_gateway_test.go |  10 +-
 .../nifcloud/network/http_not_used_test.go    |  50 +++---
 .../network/no_common_private_elb_test.go     |  14 +-
 .../network/no_common_private_router_test.go  |  14 +-
 .../network/use_secure_tls_policy_test.go     |  26 +--
 ...d_description_to_db_security_group_test.go |  14 +-
 .../rdb/no_common_private_db_instance_test.go |  10 +-
 .../nifcloud/rdb/no_public_db_access_test.go  |  10 +-
 .../rdb/no_public_ingress_db_sgr_test.go      |  14 +-
 .../rdb/specify_backup_retention_test.go      |  10 +-
 .../remove_expired_certificates_test.go       |  10 +-
 .../compute/no_plaintext_password_test.go     |  10 +-
 .../compute/no_public_access_test.go          |  34 ++--
 .../add_description_to_security_group_test.go |  10 +-
 .../networking/no_public_egress_test.go       |  34 ++--
 .../networking/no_public_ingress_test.go      |  34 ++--
 .../cloud/oracle/compute/no_public_ip_test.go |  10 +-
 .../network/no_public_egress_test.go          |  22 +--
 .../network/no_public_ingress_test.go         |  22 +--
 314 files changed, 3433 insertions(+), 3433 deletions(-)

diff --git a/checks/cloud/aws/accessanalyzer/enable_access_analyzer.go b/checks/cloud/aws/accessanalyzer/enable_access_analyzer.go
index 619fdcfa..3deb1999 100755
--- a/checks/cloud/aws/accessanalyzer/enable_access_analyzer.go
+++ b/checks/cloud/aws/accessanalyzer/enable_access_analyzer.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 	"github.com/aquasecurity/trivy/pkg/iac/severity"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 var CheckEnableAccessAnalyzer = rules.Register(
@@ -47,10 +47,10 @@ keys, AWS Lambda functions, and Amazon SQS(Simple Queue Service) queues.
 		if !enabled {
 			results.Add(
 				"Access Analyzer is not enabled.",
-				defsecTypes.NewUnmanagedMetadata(),
+				trivyTypes.NewUnmanagedMetadata(),
 			)
 		} else {
-			results.AddPassed(defsecTypes.NewUnmanagedMetadata())
+			results.AddPassed(trivyTypes.NewUnmanagedMetadata())
 		}
 		return
 	},
diff --git a/checks/cloud/aws/accessanalyzer/enable_access_analyzer_test.go b/checks/cloud/aws/accessanalyzer/enable_access_analyzer_test.go
index 14a8743e..ecfedd49 100644
--- a/checks/cloud/aws/accessanalyzer/enable_access_analyzer_test.go
+++ b/checks/cloud/aws/accessanalyzer/enable_access_analyzer_test.go
@@ -3,7 +3,7 @@ package accessanalyzer
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/accessanalyzer"
 
@@ -30,10 +30,10 @@ func TestASCheckNoSecretsInUserData(t *testing.T) {
 			input: accessanalyzer.AccessAnalyzer{
 				Analyzers: []accessanalyzer.Analyzer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						ARN:      defsecTypes.String("arn:aws:accessanalyzer:us-east-1:123456789012:analyzer/test", defsecTypes.NewTestMetadata()),
-						Name:     defsecTypes.String("test", defsecTypes.NewTestMetadata()),
-						Active:   defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						ARN:      trivyTypes.String("arn:aws:accessanalyzer:us-east-1:123456789012:analyzer/test", trivyTypes.NewTestMetadata()),
+						Name:     trivyTypes.String("test", trivyTypes.NewTestMetadata()),
+						Active:   trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -44,10 +44,10 @@ func TestASCheckNoSecretsInUserData(t *testing.T) {
 			input: accessanalyzer.AccessAnalyzer{
 				Analyzers: []accessanalyzer.Analyzer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						ARN:      defsecTypes.String("arn:aws:accessanalyzer:us-east-1:123456789012:analyzer/test", defsecTypes.NewTestMetadata()),
-						Name:     defsecTypes.String("test", defsecTypes.NewTestMetadata()),
-						Active:   defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						ARN:      trivyTypes.String("arn:aws:accessanalyzer:us-east-1:123456789012:analyzer/test", trivyTypes.NewTestMetadata()),
+						Name:     trivyTypes.String("test", trivyTypes.NewTestMetadata()),
+						Active:   trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/apigateway/enable_access_logging_test.go b/checks/cloud/aws/apigateway/enable_access_logging_test.go
index 3613f640..390805d7 100644
--- a/checks/cloud/aws/apigateway/enable_access_logging_test.go
+++ b/checks/cloud/aws/apigateway/enable_access_logging_test.go
@@ -3,7 +3,7 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
@@ -25,13 +25,13 @@ func TestCheckEnableAccessLogging(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Stages: []v1.Stage{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								AccessLogging: v1.AccessLogging{
-									Metadata:              defsecTypes.NewTestMetadata(),
-									CloudwatchLogGroupARN: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+									Metadata:              trivyTypes.NewTestMetadata(),
+									CloudwatchLogGroupARN: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -45,13 +45,13 @@ func TestCheckEnableAccessLogging(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Stages: []v1.Stage{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								AccessLogging: v1.AccessLogging{
-									Metadata:              defsecTypes.NewTestMetadata(),
-									CloudwatchLogGroupARN: defsecTypes.String("log-group-arn", defsecTypes.NewTestMetadata()),
+									Metadata:              trivyTypes.NewTestMetadata(),
+									CloudwatchLogGroupARN: trivyTypes.String("log-group-arn", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/aws/apigateway/enable_cache_encryption_test.go b/checks/cloud/aws/apigateway/enable_cache_encryption_test.go
index 126e445b..70fbec68 100644
--- a/checks/cloud/aws/apigateway/enable_cache_encryption_test.go
+++ b/checks/cloud/aws/apigateway/enable_cache_encryption_test.go
@@ -3,7 +3,7 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
@@ -25,15 +25,15 @@ func TestCheckEnableCacheEncryption(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Stages: []v1.Stage{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								RESTMethodSettings: []v1.RESTMethodSettings{
 									{
-										Metadata:           defsecTypes.NewTestMetadata(),
-										CacheDataEncrypted: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										CacheEnabled:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+										Metadata:           trivyTypes.NewTestMetadata(),
+										CacheDataEncrypted: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										CacheEnabled:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -48,15 +48,15 @@ func TestCheckEnableCacheEncryption(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Stages: []v1.Stage{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								RESTMethodSettings: []v1.RESTMethodSettings{
 									{
-										Metadata:           defsecTypes.NewTestMetadata(),
-										CacheDataEncrypted: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-										CacheEnabled:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+										Metadata:           trivyTypes.NewTestMetadata(),
+										CacheDataEncrypted: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+										CacheEnabled:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -71,15 +71,15 @@ func TestCheckEnableCacheEncryption(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Stages: []v1.Stage{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								RESTMethodSettings: []v1.RESTMethodSettings{
 									{
-										Metadata:           defsecTypes.NewTestMetadata(),
-										CacheDataEncrypted: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										CacheEnabled:       defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+										Metadata:           trivyTypes.NewTestMetadata(),
+										CacheDataEncrypted: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										CacheEnabled:       trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/aws/apigateway/enable_cache_test.go b/checks/cloud/aws/apigateway/enable_cache_test.go
index d902d861..d3083807 100644
--- a/checks/cloud/aws/apigateway/enable_cache_test.go
+++ b/checks/cloud/aws/apigateway/enable_cache_test.go
@@ -3,7 +3,7 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
@@ -25,14 +25,14 @@ func TestCheckEnableCache(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Stages: []v1.Stage{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								RESTMethodSettings: []v1.RESTMethodSettings{
 									{
-										Metadata:     defsecTypes.NewTestMetadata(),
-										CacheEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+										Metadata:     trivyTypes.NewTestMetadata(),
+										CacheEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -48,14 +48,14 @@ func TestCheckEnableCache(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Stages: []v1.Stage{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								RESTMethodSettings: []v1.RESTMethodSettings{
 									{
-										Metadata:     defsecTypes.NewTestMetadata(),
-										CacheEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+										Metadata:     trivyTypes.NewTestMetadata(),
+										CacheEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/aws/apigateway/enable_tracing_test.go b/checks/cloud/aws/apigateway/enable_tracing_test.go
index 636bdc74..1a82b01f 100644
--- a/checks/cloud/aws/apigateway/enable_tracing_test.go
+++ b/checks/cloud/aws/apigateway/enable_tracing_test.go
@@ -3,7 +3,7 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
@@ -25,11 +25,11 @@ func TestCheckEnableTracing(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Stages: []v1.Stage{
 							{
-								Metadata:           defsecTypes.NewTestMetadata(),
-								XRayTracingEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:           trivyTypes.NewTestMetadata(),
+								XRayTracingEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,11 +42,11 @@ func TestCheckEnableTracing(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Stages: []v1.Stage{
 							{
-								Metadata:           defsecTypes.NewTestMetadata(),
-								XRayTracingEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:           trivyTypes.NewTestMetadata(),
+								XRayTracingEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/apigateway/no_public_access_test.go b/checks/cloud/aws/apigateway/no_public_access_test.go
index 3949a769..043b5345 100644
--- a/checks/cloud/aws/apigateway/no_public_access_test.go
+++ b/checks/cloud/aws/apigateway/no_public_access_test.go
@@ -3,7 +3,7 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
@@ -25,15 +25,15 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Resources: []v1.Resource{
 							{
 								Methods: []v1.Method{
 									{
-										Metadata:          defsecTypes.NewTestMetadata(),
-										HTTPMethod:        defsecTypes.String("GET", defsecTypes.NewTestMetadata()),
-										APIKeyRequired:    defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										AuthorizationType: defsecTypes.String(v1.AuthorizationNone, defsecTypes.NewTestMetadata()),
+										Metadata:          trivyTypes.NewTestMetadata(),
+										HTTPMethod:        trivyTypes.String("GET", trivyTypes.NewTestMetadata()),
+										APIKeyRequired:    trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										AuthorizationType: trivyTypes.String(v1.AuthorizationNone, trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -48,15 +48,15 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Resources: []v1.Resource{
 							{
 								Methods: []v1.Method{
 									{
-										Metadata:          defsecTypes.NewTestMetadata(),
-										HTTPMethod:        defsecTypes.String("OPTION", defsecTypes.NewTestMetadata()),
-										APIKeyRequired:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-										AuthorizationType: defsecTypes.String(v1.AuthorizationNone, defsecTypes.NewTestMetadata()),
+										Metadata:          trivyTypes.NewTestMetadata(),
+										HTTPMethod:        trivyTypes.String("OPTION", trivyTypes.NewTestMetadata()),
+										APIKeyRequired:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+										AuthorizationType: trivyTypes.String(v1.AuthorizationNone, trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -71,15 +71,15 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: v1.APIGateway{
 				APIs: []v1.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Resources: []v1.Resource{
 							{
 								Methods: []v1.Method{
 									{
-										Metadata:          defsecTypes.NewTestMetadata(),
-										HTTPMethod:        defsecTypes.String("GET", defsecTypes.NewTestMetadata()),
-										APIKeyRequired:    defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										AuthorizationType: defsecTypes.String(v1.AuthorizationIAM, defsecTypes.NewTestMetadata()),
+										Metadata:          trivyTypes.NewTestMetadata(),
+										HTTPMethod:        trivyTypes.String("GET", trivyTypes.NewTestMetadata()),
+										APIKeyRequired:    trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										AuthorizationType: trivyTypes.String(v1.AuthorizationIAM, trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/aws/apigateway/use_secure_tls_policy_test.go b/checks/cloud/aws/apigateway/use_secure_tls_policy_test.go
index 2b2a7a20..ec072a42 100644
--- a/checks/cloud/aws/apigateway/use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/apigateway/use_secure_tls_policy_test.go
@@ -3,7 +3,7 @@ package apigateway
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
 
@@ -25,8 +25,8 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: v1.APIGateway{
 				DomainNames: []v1.DomainName{
 					{
-						Metadata:       defsecTypes.NewTestMetadata(),
-						SecurityPolicy: defsecTypes.String("TLS_1_0", defsecTypes.NewTestMetadata()),
+						Metadata:       trivyTypes.NewTestMetadata(),
+						SecurityPolicy: trivyTypes.String("TLS_1_0", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -37,8 +37,8 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: v1.APIGateway{
 				DomainNames: []v1.DomainName{
 					{
-						Metadata:       defsecTypes.NewTestMetadata(),
-						SecurityPolicy: defsecTypes.String("TLS_1_2", defsecTypes.NewTestMetadata()),
+						Metadata:       trivyTypes.NewTestMetadata(),
+						SecurityPolicy: trivyTypes.String("TLS_1_2", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/athena/enable_at_rest_encryption_test.go b/checks/cloud/aws/athena/enable_at_rest_encryption_test.go
index a9005890..02127836 100644
--- a/checks/cloud/aws/athena/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/athena/enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package athena
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: athena.Athena{
 				Databases: []athena.Database{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: athena.EncryptionConfiguration{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String(athena.EncryptionTypeNone, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String(athena.EncryptionTypeNone, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: athena.Athena{
 				Workgroups: []athena.Workgroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: athena.EncryptionConfiguration{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String(athena.EncryptionTypeNone, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String(athena.EncryptionTypeNone, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -54,19 +54,19 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: athena.Athena{
 				Databases: []athena.Database{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: athena.EncryptionConfiguration{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String(athena.EncryptionTypeSSEKMS, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String(athena.EncryptionTypeSSEKMS, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
 				Workgroups: []athena.Workgroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: athena.EncryptionConfiguration{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String(athena.EncryptionTypeSSEKMS, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String(athena.EncryptionTypeSSEKMS, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/athena/no_encryption_override_test.go b/checks/cloud/aws/athena/no_encryption_override_test.go
index 7c1b19d2..55ec5241 100644
--- a/checks/cloud/aws/athena/no_encryption_override_test.go
+++ b/checks/cloud/aws/athena/no_encryption_override_test.go
@@ -3,7 +3,7 @@ package athena
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoEncryptionOverride(t *testing.T) {
 			input: athena.Athena{
 				Workgroups: []athena.Workgroup{
 					{
-						Metadata:             defsecTypes.NewTestMetadata(),
-						EnforceConfiguration: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:             trivyTypes.NewTestMetadata(),
+						EnforceConfiguration: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoEncryptionOverride(t *testing.T) {
 			input: athena.Athena{
 				Workgroups: []athena.Workgroup{
 					{
-						Metadata:             defsecTypes.NewTestMetadata(),
-						EnforceConfiguration: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:             trivyTypes.NewTestMetadata(),
+						EnforceConfiguration: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/cloudfront/enable_logging_test.go b/checks/cloud/aws/cloudfront/enable_logging_test.go
index 24d7230c..f40030ab 100644
--- a/checks/cloud/aws/cloudfront/enable_logging_test.go
+++ b/checks/cloud/aws/cloudfront/enable_logging_test.go
@@ -3,7 +3,7 @@ package cloudfront
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableLogging(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: cloudfront.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Bucket:   defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Bucket:   trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableLogging(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: cloudfront.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Bucket:   defsecTypes.String("mylogs.s3.amazonaws.com", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Bucket:   trivyTypes.String("mylogs.s3.amazonaws.com", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/cloudfront/enable_waf_test.go b/checks/cloud/aws/cloudfront/enable_waf_test.go
index 5498c65c..9752ef4f 100644
--- a/checks/cloud/aws/cloudfront/enable_waf_test.go
+++ b/checks/cloud/aws/cloudfront/enable_waf_test.go
@@ -3,7 +3,7 @@ package cloudfront
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableWaf(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						WAFID:    defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						WAFID:    trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableWaf(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						WAFID:    defsecTypes.String("waf_id", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						WAFID:    trivyTypes.String("waf_id", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/cloudfront/enforce_https_test.go b/checks/cloud/aws/cloudfront/enforce_https_test.go
index a46ffa20..fd0723a8 100644
--- a/checks/cloud/aws/cloudfront/enforce_https_test.go
+++ b/checks/cloud/aws/cloudfront/enforce_https_test.go
@@ -3,7 +3,7 @@ package cloudfront
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						DefaultCacheBehaviour: cloudfront.CacheBehaviour{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							ViewerProtocolPolicy: defsecTypes.String(cloudfront.ViewerPolicyProtocolAllowAll, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							ViewerProtocolPolicy: trivyTypes.String(cloudfront.ViewerPolicyProtocolAllowAll, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,15 +39,15 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						DefaultCacheBehaviour: cloudfront.CacheBehaviour{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							ViewerProtocolPolicy: defsecTypes.String(cloudfront.ViewerPolicyProtocolHTTPSOnly, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							ViewerProtocolPolicy: trivyTypes.String(cloudfront.ViewerPolicyProtocolHTTPSOnly, trivyTypes.NewTestMetadata()),
 						},
 						OrdererCacheBehaviours: []cloudfront.CacheBehaviour{
 							{
-								Metadata:             defsecTypes.NewTestMetadata(),
-								ViewerProtocolPolicy: defsecTypes.String(cloudfront.ViewerPolicyProtocolAllowAll, defsecTypes.NewTestMetadata()),
+								Metadata:             trivyTypes.NewTestMetadata(),
+								ViewerProtocolPolicy: trivyTypes.String(cloudfront.ViewerPolicyProtocolAllowAll, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -60,15 +60,15 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						DefaultCacheBehaviour: cloudfront.CacheBehaviour{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							ViewerProtocolPolicy: defsecTypes.String(cloudfront.ViewerPolicyProtocolHTTPSOnly, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							ViewerProtocolPolicy: trivyTypes.String(cloudfront.ViewerPolicyProtocolHTTPSOnly, trivyTypes.NewTestMetadata()),
 						},
 						OrdererCacheBehaviours: []cloudfront.CacheBehaviour{
 							{
-								Metadata:             defsecTypes.NewTestMetadata(),
-								ViewerProtocolPolicy: defsecTypes.String(cloudfront.ViewerPolicyProtocolHTTPSOnly, defsecTypes.NewTestMetadata()),
+								Metadata:             trivyTypes.NewTestMetadata(),
+								ViewerProtocolPolicy: trivyTypes.String(cloudfront.ViewerPolicyProtocolHTTPSOnly, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/cloudfront/use_secure_tls_policy_test.go b/checks/cloud/aws/cloudfront/use_secure_tls_policy_test.go
index c436b754..4aed48e5 100644
--- a/checks/cloud/aws/cloudfront/use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/cloudfront/use_secure_tls_policy_test.go
@@ -3,7 +3,7 @@ package cloudfront
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ViewerCertificate: cloudfront.ViewerCertificate{
-							Metadata:               defsecTypes.NewTestMetadata(),
-							MinimumProtocolVersion: defsecTypes.String("TLSv1.0", defsecTypes.NewTestMetadata()),
-							SSLSupportMethod:       defsecTypes.String("sni-only", defsecTypes.NewTestMetadata()),
+							Metadata:               trivyTypes.NewTestMetadata(),
+							MinimumProtocolVersion: trivyTypes.String("TLSv1.0", trivyTypes.NewTestMetadata()),
+							SSLSupportMethod:       trivyTypes.String("sni-only", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,10 +40,10 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ViewerCertificate: cloudfront.ViewerCertificate{
-							Metadata:               defsecTypes.NewTestMetadata(),
-							MinimumProtocolVersion: defsecTypes.String(cloudfront.ProtocolVersionTLS1_2, defsecTypes.NewTestMetadata()),
+							Metadata:               trivyTypes.NewTestMetadata(),
+							MinimumProtocolVersion: trivyTypes.String(cloudfront.ProtocolVersionTLS1_2, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -55,11 +55,11 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ViewerCertificate: cloudfront.ViewerCertificate{
-							Metadata:                     defsecTypes.NewTestMetadata(),
-							MinimumProtocolVersion:       defsecTypes.String("TLSv1.0", defsecTypes.NewTestMetadata()),
-							CloudfrontDefaultCertificate: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:                     trivyTypes.NewTestMetadata(),
+							MinimumProtocolVersion:       trivyTypes.String("TLSv1.0", trivyTypes.NewTestMetadata()),
+							CloudfrontDefaultCertificate: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -71,11 +71,11 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: cloudfront.Cloudfront{
 				Distributions: []cloudfront.Distribution{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ViewerCertificate: cloudfront.ViewerCertificate{
-							Metadata:               defsecTypes.NewTestMetadata(),
-							MinimumProtocolVersion: defsecTypes.String("TLSv1.0", defsecTypes.NewTestMetadata()),
-							SSLSupportMethod:       defsecTypes.String("vip", defsecTypes.NewTestMetadata()),
+							Metadata:               trivyTypes.NewTestMetadata(),
+							MinimumProtocolVersion: trivyTypes.String("TLSv1.0", trivyTypes.NewTestMetadata()),
+							SSLSupportMethod:       trivyTypes.String("vip", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/cloudtrail/enable_all_regions_test.go b/checks/cloud/aws/cloudtrail/enable_all_regions_test.go
index a096f9cd..4ca1c625 100644
--- a/checks/cloud/aws/cloudtrail/enable_all_regions_test.go
+++ b/checks/cloud/aws/cloudtrail/enable_all_regions_test.go
@@ -3,7 +3,7 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableAllRegions(t *testing.T) {
 			input: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						IsMultiRegion: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						IsMultiRegion: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableAllRegions(t *testing.T) {
 			input: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						IsMultiRegion: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						IsMultiRegion: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/cloudtrail/enable_at_rest_encryption_test.go b/checks/cloud/aws/cloudtrail/enable_at_rest_encryption_test.go
index 99e83494..ea44d9d7 100644
--- a/checks/cloud/aws/cloudtrail/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/cloudtrail/enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("some-kms-key", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("some-kms-key", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/cloudtrail/enable_log_validation_test.go b/checks/cloud/aws/cloudtrail/enable_log_validation_test.go
index fdbd2766..bfe1d465 100644
--- a/checks/cloud/aws/cloudtrail/enable_log_validation_test.go
+++ b/checks/cloud/aws/cloudtrail/enable_log_validation_test.go
@@ -3,7 +3,7 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableLogValidation(t *testing.T) {
 			input: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                defsecTypes.NewTestMetadata(),
-						EnableLogFileValidation: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:                trivyTypes.NewTestMetadata(),
+						EnableLogFileValidation: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableLogValidation(t *testing.T) {
 			input: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                defsecTypes.NewTestMetadata(),
-						EnableLogFileValidation: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                trivyTypes.NewTestMetadata(),
+						EnableLogFileValidation: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration_test.go b/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration_test.go
index 4c63123b..3700afcb 100644
--- a/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration_test.go
+++ b/checks/cloud/aws/cloudtrail/ensure_cloudwatch_integration_test.go
@@ -3,7 +3,7 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
@@ -23,8 +23,8 @@ func TestCheckEnsureCloudwatchIntegration(t *testing.T) {
 			input: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group", defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:logs:us-east-1:123456789012:log-group:my-log-group", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -35,8 +35,8 @@ func TestCheckEnsureCloudwatchIntegration(t *testing.T) {
 			input: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/cloudtrail/no_public_log_access_test.go b/checks/cloud/aws/cloudtrail/no_public_log_access_test.go
index a4c681be..f5db0160 100644
--- a/checks/cloud/aws/cloudtrail/no_public_log_access_test.go
+++ b/checks/cloud/aws/cloudtrail/no_public_log_access_test.go
@@ -3,7 +3,7 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -26,17 +26,17 @@ func TestCheckNoPublicLogAccess(t *testing.T) {
 			inputCT: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						BucketName: defsecTypes.String("my-bucket", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						BucketName: trivyTypes.String("my-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			inputS3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("my-bucket", defsecTypes.NewTestMetadata()),
-						ACL:      defsecTypes.String("private", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("my-bucket", trivyTypes.NewTestMetadata()),
+						ACL:      trivyTypes.String("private", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -47,17 +47,17 @@ func TestCheckNoPublicLogAccess(t *testing.T) {
 			inputCT: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						BucketName: defsecTypes.String("my-bucket", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						BucketName: trivyTypes.String("my-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			inputS3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("my-bucket", defsecTypes.NewTestMetadata()),
-						ACL:      defsecTypes.String("public-read", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("my-bucket", trivyTypes.NewTestMetadata()),
+						ACL:      trivyTypes.String("public-read", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/cloudtrail/require_bucket_access_logging_test.go b/checks/cloud/aws/cloudtrail/require_bucket_access_logging_test.go
index d036129a..60b89080 100644
--- a/checks/cloud/aws/cloudtrail/require_bucket_access_logging_test.go
+++ b/checks/cloud/aws/cloudtrail/require_bucket_access_logging_test.go
@@ -3,7 +3,7 @@ package cloudtrail
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -26,19 +26,19 @@ func TestCheckBucketAccessLoggingRequired(t *testing.T) {
 			inputCT: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						BucketName: defsecTypes.String("my-bucket", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						BucketName: trivyTypes.String("my-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			inputS3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("my-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("my-bucket", trivyTypes.NewTestMetadata()),
 						Logging: s3.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -50,19 +50,19 @@ func TestCheckBucketAccessLoggingRequired(t *testing.T) {
 			inputCT: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						BucketName: defsecTypes.String("my-bucket", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						BucketName: trivyTypes.String("my-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			inputS3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("my-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("my-bucket", trivyTypes.NewTestMetadata()),
 						Logging: s3.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/cloudwatch/log_group_customer_key_test.go b/checks/cloud/aws/cloudwatch/log_group_customer_key_test.go
index 6462739f..9060a0c3 100644
--- a/checks/cloud/aws/cloudwatch/log_group_customer_key_test.go
+++ b/checks/cloud/aws/cloudwatch/log_group_customer_key_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckLogGroupCustomerKey(t *testing.T) {
 			input: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckLogGroupCustomerKey(t *testing.T) {
 			input: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("some-kms-key", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("some-kms-key", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm_test.go
index c51be507..e79d94fe 100644
--- a/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_cloudtrail_change_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,36 +24,36 @@ func TestCheckRequireCloudTrailChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								FilterName:    defsecTypes.String("CloudTrailConfigurationChange", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`   {($.eventName=CreateTrail) || ($.eventName=UpdateTrail) || ($.eventName=DeleteTrail) || ($.eventName=StartLogging) || ($.eventName=StopLogging)}`, defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								FilterName:    trivyTypes.String("CloudTrailConfigurationChange", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`   {($.eventName=CreateTrail) || ($.eventName=UpdateTrail) || ($.eventName=DeleteTrail) || ($.eventName=StartLogging) || ($.eventName=StopLogging)}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("CloudTrailConfigurationChange", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("CloudTrailConfigurationChange", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("CloudTrailConfigurationChange", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("CloudTrailConfigurationChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("CloudTrailConfigurationChange", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("CloudTrailConfigurationChange", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -66,25 +66,25 @@ func TestCheckRequireCloudTrailChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("CloudTrailConfigurationChange", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("CloudTrailConfigurationChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm_test.go b/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm_test.go
index aab123b9..46b21df9 100644
--- a/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_cmk_disabled_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,36 +24,36 @@ func TestCheckCMKDisabledAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								FilterName:    defsecTypes.String("CMKDisbledOrScheduledDelete", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventSource=kms.amazonaws.com) && (($.eventName=DisableKey) || ($.eventName=ScheduleKeyDeletion))}`, defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								FilterName:    trivyTypes.String("CMKDisbledOrScheduledDelete", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventSource=kms.amazonaws.com) && (($.eventName=DisableKey) || ($.eventName=ScheduleKeyDeletion))}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("CMKDisbledOrScheduledDelete", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("CMKDisbledOrScheduledDelete", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("CMKDisbledOrScheduledDelete", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("CMKDisbledOrScheduledDelete", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("CMKDisbledOrScheduledDelete", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("CMKDisbledOrScheduledDelete", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -66,25 +66,25 @@ func TestCheckCMKDisabledAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("CMKDisbledOrScheduledDelete", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("CMKDisbledOrScheduledDelete", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm_test.go
index 3bf15ed1..2cd3d988 100644
--- a/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_config_configuration_change_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,36 +24,36 @@ func TestCheckConfigConfigurationChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								FilterName:    defsecTypes.String("ConfigConfigurationChange", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventSource=config.amazonaws.com) && (($.eventName=StopConfigurationRecorder) || ($.eventName=DeleteDeliveryChannel) || ($.eventName=PutDeliveryChannel) || ($.eventName=PutConfigurationRecorder))}`, defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								FilterName:    trivyTypes.String("ConfigConfigurationChange", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventSource=config.amazonaws.com) && (($.eventName=StopConfigurationRecorder) || ($.eventName=DeleteDeliveryChannel) || ($.eventName=PutDeliveryChannel) || ($.eventName=PutConfigurationRecorder))}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("ConfigConfigurationChange", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("ConfigConfigurationChange", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("ConfigConfigurationChange", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("ConfigConfigurationChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("ConfigConfigurationChange", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("ConfigConfigurationChange", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -66,25 +66,25 @@ func TestCheckConfigConfigurationChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("ConfigConfigurationChange", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("ConfigConfigurationChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm_test.go b/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm_test.go
index d61aa8ec..68530985 100644
--- a/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_console_login_failure_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,36 +24,36 @@ func TestCheckRequireConsoleLoginFailureAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								FilterName:    defsecTypes.String("ConsoleLoginFailure", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventName=ConsoleLogin) && ($.errorMessage="Failed authentication")}`, defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								FilterName:    trivyTypes.String("ConsoleLoginFailure", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventName=ConsoleLogin) && ($.errorMessage="Failed authentication")}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("ConsoleLoginFailure", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("ConsoleLoginFailure", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("ConsoleLoginFailure", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("ConsoleLoginFailure", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("ConsoleLoginFailure", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("ConsoleLoginFailure", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -66,25 +66,25 @@ func TestCheckRequireConsoleLoginFailureAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("ConsoleLoginFailure", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("ConsoleLoginFailure", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm_test.go
index 67409e21..797ad461 100644
--- a/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_iam_policy_change_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,23 +24,23 @@ func TestCheckRequireIAMPolicyChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								FilterName: defsecTypes.String("IAMPolicyChanged", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventName=DeleteGroupPolicy) || 
+								Metadata:   trivyTypes.NewTestMetadata(),
+								FilterName: trivyTypes.String("IAMPolicyChanged", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventName=DeleteGroupPolicy) || 
 ($.eventName=DeleteRolePolicy) || 
 ($.eventName=DeleteUserPolicy) || 
 ($.eventName=PutGroupPolicy) || 
@@ -55,20 +55,20 @@ func TestCheckRequireIAMPolicyChangeAlarm(t *testing.T) {
 ($.eventName=AttachUserPolicy) || 
 ($.eventName=DetachUserPolicy) || 
 ($.eventName=AttachGroupPolicy) || 
-($.eventName=DetachGroupPolicy)}`, defsecTypes.NewTestMetadata()),
+($.eventName=DetachGroupPolicy)}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("IAMPolicyChanged", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("IAMPolicyChanged", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("IAMPolicyChanged", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("IAMPolicyChanged", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("IAMPolicyChanged", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("IAMPolicyChanged", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -81,25 +81,25 @@ func TestCheckRequireIAMPolicyChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("CloudTrail_Unauthorized_API_Call", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("CloudTrail_Unauthorized_API_Call", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_nacl_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_nacl_change_alarm_test.go
index 443f4997..e88201c2 100644
--- a/checks/cloud/aws/cloudwatch/require_nacl_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_nacl_change_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,39 +24,39 @@ func TestCheckNACLChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								FilterName: defsecTypes.String("NACLChange", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventName=CreateNetworkAcl) || 
+								Metadata:   trivyTypes.NewTestMetadata(),
+								FilterName: trivyTypes.String("NACLChange", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventName=CreateNetworkAcl) || 
 					($.eventName=CreateNetworkAclEntry) || ($.eventName=DeleteNetworkAcl) || 
 					($.eventName=DeleteNetworkAclEntry) || ($.eventName=ReplaceNetworkAclEntry) || 
-					($.eventName=ReplaceNetworkAclAssociation)}`, defsecTypes.NewTestMetadata()),
+					($.eventName=ReplaceNetworkAclAssociation)}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("NACLChange", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("NACLChange", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("NACLChange", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("NACLChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("NACLChange", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("NACLChange", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -69,25 +69,25 @@ func TestCheckNACLChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("NACLChange", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("NACLChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm_test.go
index bf2c4880..0db899cd 100644
--- a/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_network_gateway_change_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,39 +24,39 @@ func TestCheckNetworkGatewayChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								FilterName: defsecTypes.String("NetworkGatewayChange", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventName=CreateCustomerGateway) || 
+								Metadata:   trivyTypes.NewTestMetadata(),
+								FilterName: trivyTypes.String("NetworkGatewayChange", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventName=CreateCustomerGateway) || 
 					($.eventName=DeleteCustomerGateway) || ($.eventName=AttachInternetGateway) || 
 					($.eventName=CreateInternetGateway) || ($.eventName=DeleteInternetGateway) || 
-					($.eventName=DetachInternetGateway)}`, defsecTypes.NewTestMetadata()),
+					($.eventName=DetachInternetGateway)}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("NetworkGatewayChange", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("NetworkGatewayChange", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("NetworkGatewayChange", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("NetworkGatewayChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("NetworkGatewayChange", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("NetworkGatewayChange", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -69,25 +69,25 @@ func TestCheckNetworkGatewayChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("NetworkGatewayChange", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("NetworkGatewayChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm_test.go b/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm_test.go
index de1ff8a1..accb00a9 100644
--- a/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_non_mfa_login_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,39 +24,39 @@ func TestCheckRequireNonMFALoginAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								FilterName: defsecTypes.String("NonMFALogin", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`($.eventName = "ConsoleLogin") && 
+								Metadata:   trivyTypes.NewTestMetadata(),
+								FilterName: trivyTypes.String("NonMFALogin", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`($.eventName = "ConsoleLogin") && 
 ($.additionalEventData.MFAUsed != "Yes") && 
 ($.userIdentity.type=="IAMUser") && 
-($.responseElements.ConsoleLogin == "Success")`, defsecTypes.NewTestMetadata()),
+($.responseElements.ConsoleLogin == "Success")`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("NonMFALogin", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("NonMFALogin", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("NonMFALogin", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("NonMFALogin", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("NonMFALogin", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("NonMFALogin", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -69,25 +69,25 @@ func TestCheckRequireNonMFALoginAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("CloudTrail_Unauthorized_API_Call", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("CloudTrail_Unauthorized_API_Call", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_org_changes_alarm_test.go b/checks/cloud/aws/cloudwatch/require_org_changes_alarm_test.go
index 098e0bd6..b02f1213 100644
--- a/checks/cloud/aws/cloudwatch/require_org_changes_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_org_changes_alarm_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
@@ -25,29 +25,29 @@ func TestCheckRequireOrgChangesAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Arn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Arn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								FilterName:    defsecTypes.String("OrganizationEvents", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String("{ $.eventSource = \"organizations.amazonaws.com\" }", defsecTypes.NewTestMetadata()),
+								FilterName:    trivyTypes.String("OrganizationEvents", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String("{ $.eventSource = \"organizations.amazonaws.com\" }", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						MetricName: defsecTypes.String("OrganizationEvents", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						MetricName: trivyTypes.String("OrganizationEvents", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -58,17 +58,17 @@ func TestCheckRequireOrgChangesAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Arn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Arn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -79,21 +79,21 @@ func TestCheckRequireOrgChangesAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Arn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Arn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								FilterName:    defsecTypes.String("OrganizationEvents", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String("{ $.eventSource = \"organizations.amazonaws.com\" }", defsecTypes.NewTestMetadata()),
+								FilterName:    trivyTypes.String("OrganizationEvents", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String("{ $.eventSource = \"organizations.amazonaws.com\" }", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm_test.go b/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm_test.go
index 5349798c..0ed7919d 100644
--- a/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_root_user_usage_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,36 +24,36 @@ func TestCheckRequireRootUserUsageAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								FilterName:    defsecTypes.String("RootUserUsage", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`$.userIdentity.type = "Root" && $.userIdentity.invokedBy NOT EXISTS && &.eventType != "AwsServiceEvent"`, defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								FilterName:    trivyTypes.String("RootUserUsage", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`$.userIdentity.type = "Root" && $.userIdentity.invokedBy NOT EXISTS && &.eventType != "AwsServiceEvent"`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("RootUserUsage", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("RootUserUsage", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("RootUserUsage", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("RootUserUsage", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("RootUserUsage", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("RootUserUsage", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -66,30 +66,30 @@ func TestCheckRequireRootUserUsageAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("RootUserUsage", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("RootUserUsage", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("RootUserUsage", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("RootUserUsage", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("RootUserUsage", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("RootUserUsage", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/cloudwatch/require_route_table_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_route_table_change_alarm_test.go
index 82f02e39..00c94701 100644
--- a/checks/cloud/aws/cloudwatch/require_route_table_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_route_table_change_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,39 +24,39 @@ func TestCheckRouteTableChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								FilterName: defsecTypes.String("RouteTableChange", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventName=CreateRoute) || 
+								Metadata:   trivyTypes.NewTestMetadata(),
+								FilterName: trivyTypes.String("RouteTableChange", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventName=CreateRoute) || 
 					($.eventName=CreateRouteTable) || ($.eventName=ReplaceRoute) || 
 					($.eventName=ReplaceRouteTableAssociation) || ($.eventName=DeleteRouteTable) || 
-					($.eventName=DeleteRoute) || ($.eventName=DisassociateRouteTable)}`, defsecTypes.NewTestMetadata()),
+					($.eventName=DeleteRoute) || ($.eventName=DisassociateRouteTable)}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("RouteTableChange", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("RouteTableChange", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("RouteTableChange", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("RouteTableChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("RouteTableChange", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("RouteTableChange", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -69,25 +69,25 @@ func TestCheckRouteTableChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("RouteTableChange", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("RouteTableChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm_test.go
index d6b9c64d..6708270d 100644
--- a/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_s3_bucket_policy_change_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,39 +24,39 @@ func TestCheckRequireS3BucketPolicyChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								FilterName: defsecTypes.String("BucketPolicyChange", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventSource=s3.amazonaws.com) && (($.eventName=PutBucketAcl) || 
+								Metadata:   trivyTypes.NewTestMetadata(),
+								FilterName: trivyTypes.String("BucketPolicyChange", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventSource=s3.amazonaws.com) && (($.eventName=PutBucketAcl) || 
 					($.eventName=PutBucketPolicy) || ($.eventName=PutBucketCors) || ($.eventName=PutBucketLifecycle) || 
 					($.eventName=PutBucketReplication) || ($.eventName=DeleteBucketPolicy) || ($.eventName=DeleteBucketCors) ||
-					 ($.eventName=DeleteBucketLifecycle) || ($.eventName=DeleteBucketReplication))}`, defsecTypes.NewTestMetadata()),
+					 ($.eventName=DeleteBucketLifecycle) || ($.eventName=DeleteBucketReplication))}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("BucketPolicyChange", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("BucketPolicyChange", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("BucketPolicyChange", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("BucketPolicyChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("BucketPolicyChange", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("BucketPolicyChange", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -69,25 +69,25 @@ func TestCheckRequireS3BucketPolicyChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("BucketPolicyChange", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("BucketPolicyChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_security_group_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_security_group_change_alarm_test.go
index 2b2213a9..661d2d70 100644
--- a/checks/cloud/aws/cloudwatch/require_security_group_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_security_group_change_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,39 +24,39 @@ func TestCheckSecurityGroupChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								FilterName: defsecTypes.String("SecurityGroupChange", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventName=AuthorizeSecurityGroupIngress) || 
+								Metadata:   trivyTypes.NewTestMetadata(),
+								FilterName: trivyTypes.String("SecurityGroupChange", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventName=AuthorizeSecurityGroupIngress) || 
 					($.eventName=AuthorizeSecurityGroupEgress) || ($.eventName=RevokeSecurityGroupIngress) ||
 					($.eventName=RevokeSecurityGroupEgress) || ($.eventName=CreateSecurityGroup) || 
-					($.eventName=DeleteSecurityGroup)}`, defsecTypes.NewTestMetadata()),
+					($.eventName=DeleteSecurityGroup)}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("SecurityGroupChange", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("SecurityGroupChange", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("SecurityGroupChange", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("SecurityGroupChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("SecurityGroupChange", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("SecurityGroupChange", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -69,25 +69,25 @@ func TestCheckSecurityGroupChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("SecurityGroupChange", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("SecurityGroupChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm_test.go b/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm_test.go
index f4b50dd6..40f6f7a2 100644
--- a/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_unauthorised_api_call_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,36 +24,36 @@ func TestCheckRequireUnauthorisedApiCallAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								FilterName:    defsecTypes.String("UnauthorizedAPIUsage", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`($.errorCode = "*UnauthorizedOperation") || ($.errorCode = "AccessDenied*")`, defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								FilterName:    trivyTypes.String("UnauthorizedAPIUsage", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`($.errorCode = "*UnauthorizedOperation") || ($.errorCode = "AccessDenied*")`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("CloudTrail_Unauthorized_API_Call", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("UnauthorizedAPIUsage", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("CloudTrail_Unauthorized_API_Call", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("UnauthorizedAPIUsage", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("UnauthorizedAPIUsage", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("UnauthorizedAPIUsage", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -66,25 +66,25 @@ func TestCheckRequireUnauthorisedApiCallAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("CloudTrail_Unauthorized_API_Call", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("CloudTrail_Unauthorized_API_Call", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/cloudwatch/require_vpc_change_alarm_test.go b/checks/cloud/aws/cloudwatch/require_vpc_change_alarm_test.go
index 2b3220e4..3b55db4b 100644
--- a/checks/cloud/aws/cloudwatch/require_vpc_change_alarm_test.go
+++ b/checks/cloud/aws/cloudwatch/require_vpc_change_alarm_test.go
@@ -3,7 +3,7 @@ package cloudwatch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
@@ -24,41 +24,41 @@ func TestCheckVPCChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Arn:      defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Arn:      trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								FilterName: defsecTypes.String("VPCChange", defsecTypes.NewTestMetadata()),
-								FilterPattern: defsecTypes.String(`{($.eventName=CreateVpc) || 
+								Metadata:   trivyTypes.NewTestMetadata(),
+								FilterName: trivyTypes.String("VPCChange", trivyTypes.NewTestMetadata()),
+								FilterPattern: trivyTypes.String(`{($.eventName=CreateVpc) || 
 					($.eventName=DeleteVpc) || ($.eventName=ModifyVpcAttribute) || 
 					($.eventName=AcceptVpcPeeringConnection) || ($.eventName=CreateVpcPeeringConnection) || 
 					($.eventName=DeleteVpcPeeringConnection) || ($.eventName=RejectVpcPeeringConnection) || 
 					($.eventName=AttachClassicLinkVpc) || ($.eventName=DetachClassicLinkVpc) || 
-					($.eventName=DisableVpcClassicLink) || ($.eventName=EnableVpcClassicLink)}`, defsecTypes.NewTestMetadata()),
+					($.eventName=DisableVpcClassicLink) || ($.eventName=EnableVpcClassicLink)}`, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						AlarmName:  defsecTypes.String("VPCChange", defsecTypes.NewTestMetadata()),
-						MetricName: defsecTypes.String("VPCChange", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						AlarmName:  trivyTypes.String("VPCChange", trivyTypes.NewTestMetadata()),
+						MetricName: trivyTypes.String("VPCChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ID:       defsecTypes.String("VPCChange", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ID:       trivyTypes.String("VPCChange", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -71,25 +71,25 @@ func TestCheckVPCChangeAlarm(t *testing.T) {
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						CloudWatchLogsLogGroupArn: defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
-						IsLogging:                 defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						IsMultiRegion:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						CloudWatchLogsLogGroupArn: trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
+						IsLogging:                 trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						IsMultiRegion:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudwatch: cloudwatch.CloudWatch{
 				LogGroups: []cloudwatch.LogGroup{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						Arn:           defsecTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						Arn:           trivyTypes.String("arn:aws:cloudwatch:us-east-1:123456789012:log-group:cloudtrail-logging", trivyTypes.NewTestMetadata()),
 						MetricFilters: []cloudwatch.MetricFilter{},
 					},
 				},
 				Alarms: []cloudwatch.Alarm{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						AlarmName: defsecTypes.String("VPCChange", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						AlarmName: trivyTypes.String("VPCChange", trivyTypes.NewTestMetadata()),
 						Metrics: []cloudwatch.MetricDataQuery{
 							{},
 						},
diff --git a/checks/cloud/aws/codebuild/enable_encryption_test.go b/checks/cloud/aws/codebuild/enable_encryption_test.go
index b7edb258..15493589 100644
--- a/checks/cloud/aws/codebuild/enable_encryption_test.go
+++ b/checks/cloud/aws/codebuild/enable_encryption_test.go
@@ -3,7 +3,7 @@ package codebuild
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableEncryption(t *testing.T) {
 			input: codebuild.CodeBuild{
 				Projects: []codebuild.Project{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ArtifactSettings: codebuild.ArtifactSettings{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							EncryptionEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							EncryptionEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,15 +39,15 @@ func TestCheckEnableEncryption(t *testing.T) {
 			input: codebuild.CodeBuild{
 				Projects: []codebuild.Project{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ArtifactSettings: codebuild.ArtifactSettings{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							EncryptionEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							EncryptionEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 						SecondaryArtifactSettings: []codebuild.ArtifactSettings{
 							{
-								Metadata:          defsecTypes.NewTestMetadata(),
-								EncryptionEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:          trivyTypes.NewTestMetadata(),
+								EncryptionEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -60,15 +60,15 @@ func TestCheckEnableEncryption(t *testing.T) {
 			input: codebuild.CodeBuild{
 				Projects: []codebuild.Project{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ArtifactSettings: codebuild.ArtifactSettings{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							EncryptionEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							EncryptionEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 						SecondaryArtifactSettings: []codebuild.ArtifactSettings{
 							{
-								Metadata:          defsecTypes.NewTestMetadata(),
-								EncryptionEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:          trivyTypes.NewTestMetadata(),
+								EncryptionEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/config/aggregate_all_regions_test.go b/checks/cloud/aws/config/aggregate_all_regions_test.go
index 7cbc1d01..af2b6d0e 100644
--- a/checks/cloud/aws/config/aggregate_all_regions_test.go
+++ b/checks/cloud/aws/config/aggregate_all_regions_test.go
@@ -3,7 +3,7 @@ package config
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckAggregateAllRegions(t *testing.T) {
 			name: "AWS Config aggregator source with all regions set to false",
 			input: config.Config{
 				ConfigurationAggregrator: config.ConfigurationAggregrator{
-					Metadata:         defsecTypes.NewTestMetadata(),
-					SourceAllRegions: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata:         trivyTypes.NewTestMetadata(),
+					SourceAllRegions: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckAggregateAllRegions(t *testing.T) {
 			name: "AWS Config aggregator source with all regions set to true",
 			input: config.Config{
 				ConfigurationAggregrator: config.ConfigurationAggregrator{
-					Metadata:         defsecTypes.NewTestMetadata(),
-					SourceAllRegions: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+					Metadata:         trivyTypes.NewTestMetadata(),
+					SourceAllRegions: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/aws/documentdb/enable_log_export_test.go b/checks/cloud/aws/documentdb/enable_log_export_test.go
index effb2a9a..9fd21b5a 100644
--- a/checks/cloud/aws/documentdb/enable_log_export_test.go
+++ b/checks/cloud/aws/documentdb/enable_log_export_test.go
@@ -3,7 +3,7 @@ package documentdb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckEnableLogExport(t *testing.T) {
 			input: documentdb.DocumentDB{
 				Clusters: []documentdb.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						EnabledLogExports: []defsecTypes.StringValue{
-							defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						EnabledLogExports: []trivyTypes.StringValue{
+							trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -38,9 +38,9 @@ func TestCheckEnableLogExport(t *testing.T) {
 			input: documentdb.DocumentDB{
 				Clusters: []documentdb.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						EnabledLogExports: []defsecTypes.StringValue{
-							defsecTypes.String(documentdb.LogExportAudit, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						EnabledLogExports: []trivyTypes.StringValue{
+							trivyTypes.String(documentdb.LogExportAudit, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -52,9 +52,9 @@ func TestCheckEnableLogExport(t *testing.T) {
 			input: documentdb.DocumentDB{
 				Clusters: []documentdb.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						EnabledLogExports: []defsecTypes.StringValue{
-							defsecTypes.String(documentdb.LogExportProfiler, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						EnabledLogExports: []trivyTypes.StringValue{
+							trivyTypes.String(documentdb.LogExportProfiler, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/documentdb/enable_storage_encryption_test.go b/checks/cloud/aws/documentdb/enable_storage_encryption_test.go
index 00cead1e..7b289cd7 100644
--- a/checks/cloud/aws/documentdb/enable_storage_encryption_test.go
+++ b/checks/cloud/aws/documentdb/enable_storage_encryption_test.go
@@ -3,7 +3,7 @@ package documentdb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableStorageEncryption(t *testing.T) {
 			input: documentdb.DocumentDB{
 				Clusters: []documentdb.Cluster{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						StorageEncrypted: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						StorageEncrypted: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableStorageEncryption(t *testing.T) {
 			input: documentdb.DocumentDB{
 				Clusters: []documentdb.Cluster{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						StorageEncrypted: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						StorageEncrypted: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/documentdb/encryption_customer_key_test.go b/checks/cloud/aws/documentdb/encryption_customer_key_test.go
index 6987b42a..86f1c1f2 100644
--- a/checks/cloud/aws/documentdb/encryption_customer_key_test.go
+++ b/checks/cloud/aws/documentdb/encryption_customer_key_test.go
@@ -3,7 +3,7 @@ package documentdb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: documentdb.DocumentDB{
 				Clusters: []documentdb.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,12 +36,12 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: documentdb.DocumentDB{
 				Clusters: []documentdb.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("kms-key", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("kms-key", trivyTypes.NewTestMetadata()),
 						Instances: []documentdb.Instance{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -54,12 +54,12 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: documentdb.DocumentDB{
 				Clusters: []documentdb.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("kms-key", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("kms-key", trivyTypes.NewTestMetadata()),
 						Instances: []documentdb.Instance{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								KMSKeyID: defsecTypes.String("kms-key", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								KMSKeyID: trivyTypes.String("kms-key", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/dynamodb/enable_at_rest_encryption_test.go b/checks/cloud/aws/dynamodb/enable_at_rest_encryption_test.go
index e742b86c..66c02a1b 100644
--- a/checks/cloud/aws/dynamodb/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/dynamodb/enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package dynamodb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: dynamodb.DynamoDB{
 				DAXClusters: []dynamodb.DAXCluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ServerSideEncryption: dynamodb.ServerSideEncryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: dynamodb.DynamoDB{
 				DAXClusters: []dynamodb.DAXCluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ServerSideEncryption: dynamodb.ServerSideEncryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/dynamodb/enable_recovery_test.go b/checks/cloud/aws/dynamodb/enable_recovery_test.go
index bd16ddff..9df6d104 100644
--- a/checks/cloud/aws/dynamodb/enable_recovery_test.go
+++ b/checks/cloud/aws/dynamodb/enable_recovery_test.go
@@ -3,7 +3,7 @@ package dynamodb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableRecovery(t *testing.T) {
 			input: dynamodb.DynamoDB{
 				DAXClusters: []dynamodb.DAXCluster{
 					{
-						Metadata:            defsecTypes.NewTestMetadata(),
-						PointInTimeRecovery: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:            trivyTypes.NewTestMetadata(),
+						PointInTimeRecovery: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableRecovery(t *testing.T) {
 			input: dynamodb.DynamoDB{
 				DAXClusters: []dynamodb.DAXCluster{
 					{
-						Metadata:            defsecTypes.NewTestMetadata(),
-						PointInTimeRecovery: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:            trivyTypes.NewTestMetadata(),
+						PointInTimeRecovery: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/dynamodb/table_customer_key_test.go b/checks/cloud/aws/dynamodb/table_customer_key_test.go
index b14775d0..56daa731 100644
--- a/checks/cloud/aws/dynamodb/table_customer_key_test.go
+++ b/checks/cloud/aws/dynamodb/table_customer_key_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/dynamodb"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -21,11 +21,11 @@ func TestCheckTableCustomerKey(t *testing.T) {
 			input: dynamodb.DynamoDB{
 				Tables: []dynamodb.Table{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ServerSideEncryption: dynamodb.ServerSideEncryption{
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -37,11 +37,11 @@ func TestCheckTableCustomerKey(t *testing.T) {
 			input: dynamodb.DynamoDB{
 				Tables: []dynamodb.Table{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ServerSideEncryption: dynamodb.ServerSideEncryption{
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String(dynamodb.DefaultKMSKeyID, defsecTypes.NewTestMetadata()),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String(dynamodb.DefaultKMSKeyID, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -53,11 +53,11 @@ func TestCheckTableCustomerKey(t *testing.T) {
 			input: dynamodb.DynamoDB{
 				Tables: []dynamodb.Table{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ServerSideEncryption: dynamodb.ServerSideEncryption{
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("some-ok-key", defsecTypes.NewTestMetadata()),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("some-ok-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -69,11 +69,11 @@ func TestCheckTableCustomerKey(t *testing.T) {
 			input: dynamodb.DynamoDB{
 				Tables: []dynamodb.Table{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ServerSideEncryption: dynamodb.ServerSideEncryption{
-							Enabled:  defsecTypes.BoolDefault(false, defsecTypes.NewTestMetadata()),
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("some-ok-key", defsecTypes.NewTestMetadata()),
+							Enabled:  trivyTypes.BoolDefault(false, trivyTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("some-ok-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ec2/add_description_to_security_group_rule_test.go b/checks/cloud/aws/ec2/add_description_to_security_group_rule_test.go
index d104b3f4..714174b0 100644
--- a/checks/cloud/aws/ec2/add_description_to_security_group_rule_test.go
+++ b/checks/cloud/aws/ec2/add_description_to_security_group_rule_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
@@ -25,11 +25,11 @@ func TestCheckAddDescriptionToSecurityGroupRule(t *testing.T) {
 			input: ec2.EC2{
 				SecurityGroups: []ec2.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IngressRules: []ec2.SecurityGroupRule{
 							{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								Description: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								Description: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,11 +42,11 @@ func TestCheckAddDescriptionToSecurityGroupRule(t *testing.T) {
 			input: ec2.EC2{
 				SecurityGroups: []ec2.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IngressRules: []ec2.SecurityGroupRule{
 							{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								Description: defsecTypes.String("some description", defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								Description: trivyTypes.String("some description", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/ec2/add_description_to_security_group_test.go b/checks/cloud/aws/ec2/add_description_to_security_group_test.go
index a607d65f..9a22ef45 100644
--- a/checks/cloud/aws/ec2/add_description_to_security_group_test.go
+++ b/checks/cloud/aws/ec2/add_description_to_security_group_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
@@ -25,8 +25,8 @@ func TestCheckAddDescriptionToSecurityGroup(t *testing.T) {
 			input: ec2.EC2{
 				SecurityGroups: []ec2.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -37,8 +37,8 @@ func TestCheckAddDescriptionToSecurityGroup(t *testing.T) {
 			input: ec2.EC2{
 				SecurityGroups: []ec2.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("Managed by Terraform", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("Managed by Terraform", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -49,8 +49,8 @@ func TestCheckAddDescriptionToSecurityGroup(t *testing.T) {
 			input: ec2.EC2{
 				SecurityGroups: []ec2.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("some proper description", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("some proper description", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/ec2/as_enable_at_rest_encryption_test.go b/checks/cloud/aws/ec2/as_enable_at_rest_encryption_test.go
index cbfc3a5d..8ddbfd5e 100644
--- a/checks/cloud/aws/ec2/as_enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/ec2/as_enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestASCheckEnableAtRestEncryption(t *testing.T) {
 			input: ec2.EC2{
 				LaunchConfigurations: []ec2.LaunchConfiguration{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RootBlockDevice: &ec2.BlockDevice{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							Encrypted: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							Encrypted: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,11 +39,11 @@ func TestASCheckEnableAtRestEncryption(t *testing.T) {
 			input: ec2.EC2{
 				LaunchConfigurations: []ec2.LaunchConfiguration{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EBSBlockDevices: []*ec2.BlockDevice{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								Encrypted: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								Encrypted: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -56,15 +56,15 @@ func TestASCheckEnableAtRestEncryption(t *testing.T) {
 			input: ec2.EC2{
 				LaunchConfigurations: []ec2.LaunchConfiguration{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RootBlockDevice: &ec2.BlockDevice{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							Encrypted: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							Encrypted: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 						EBSBlockDevices: []*ec2.BlockDevice{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								Encrypted: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								Encrypted: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/ec2/as_enforce_http_token_imds_test.go b/checks/cloud/aws/ec2/as_enforce_http_token_imds_test.go
index 855ffec8..b82c08fa 100644
--- a/checks/cloud/aws/ec2/as_enforce_http_token_imds_test.go
+++ b/checks/cloud/aws/ec2/as_enforce_http_token_imds_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestASCheckIMDSAccessRequiresToken(t *testing.T) {
 			input: ec2.EC2{
 				LaunchConfigurations: []ec2.LaunchConfiguration{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MetadataOptions: ec2.MetadataOptions{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							HttpTokens:   defsecTypes.String("optional", defsecTypes.NewTestMetadata()),
-							HttpEndpoint: defsecTypes.String("enabled", defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							HttpTokens:   trivyTypes.String("optional", trivyTypes.NewTestMetadata()),
+							HttpEndpoint: trivyTypes.String("enabled", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,13 +40,13 @@ func TestASCheckIMDSAccessRequiresToken(t *testing.T) {
 			input: ec2.EC2{
 				LaunchTemplates: []ec2.LaunchTemplate{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Instance: ec2.Instance{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							MetadataOptions: ec2.MetadataOptions{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								HttpTokens:   defsecTypes.String("optional", defsecTypes.NewTestMetadata()),
-								HttpEndpoint: defsecTypes.String("enabled", defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								HttpTokens:   trivyTypes.String("optional", trivyTypes.NewTestMetadata()),
+								HttpEndpoint: trivyTypes.String("enabled", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -59,11 +59,11 @@ func TestASCheckIMDSAccessRequiresToken(t *testing.T) {
 			input: ec2.EC2{
 				LaunchConfigurations: []ec2.LaunchConfiguration{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MetadataOptions: ec2.MetadataOptions{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							HttpTokens:   defsecTypes.String("required", defsecTypes.NewTestMetadata()),
-							HttpEndpoint: defsecTypes.String("enabled", defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							HttpTokens:   trivyTypes.String("required", trivyTypes.NewTestMetadata()),
+							HttpEndpoint: trivyTypes.String("enabled", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ec2/as_no_secrets_in_user_data_test.go b/checks/cloud/aws/ec2/as_no_secrets_in_user_data_test.go
index ba5365fe..8d085844 100644
--- a/checks/cloud/aws/ec2/as_no_secrets_in_user_data_test.go
+++ b/checks/cloud/aws/ec2/as_no_secrets_in_user_data_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,14 +24,14 @@ func TestASCheckNoSecretsInUserData(t *testing.T) {
 			input: ec2.EC2{
 				LaunchTemplates: []ec2.LaunchTemplate{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Instance: ec2.Instance{
-							Metadata: defsecTypes.NewTestMetadata(),
-							UserData: defsecTypes.String(`
+							Metadata: trivyTypes.NewTestMetadata(),
+							UserData: trivyTypes.String(`
 							export AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMPLE
 							export AWS_SECRET_ACCESS_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
 							export AWS_DEFAULT_REGION=us-west-2
-							`, defsecTypes.NewTestMetadata()),
+							`, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -43,12 +43,12 @@ func TestASCheckNoSecretsInUserData(t *testing.T) {
 			input: ec2.EC2{
 				LaunchTemplates: []ec2.LaunchTemplate{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Instance: ec2.Instance{
-							Metadata: defsecTypes.NewTestMetadata(),
-							UserData: defsecTypes.String(`
+							Metadata: trivyTypes.NewTestMetadata(),
+							UserData: trivyTypes.String(`
 							export GREETING=hello
-							`, defsecTypes.NewTestMetadata()),
+							`, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ec2/enable_at_rest_encryption_test.go b/checks/cloud/aws/ec2/enable_at_rest_encryption_test.go
index 6f81f043..925eabf2 100644
--- a/checks/cloud/aws/ec2/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/ec2/enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
@@ -25,7 +25,7 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 				Instances: []ec2.Instance{
 					{
 						RootBlockDevice: &ec2.BlockDevice{
-							Encrypted: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Encrypted: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -38,7 +38,7 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 				Instances: []ec2.Instance{
 					{
 						RootBlockDevice: &ec2.BlockDevice{
-							Encrypted: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Encrypted: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ec2/enable_volume_encryption_test.go b/checks/cloud/aws/ec2/enable_volume_encryption_test.go
index e0e0bfd9..e5261c57 100644
--- a/checks/cloud/aws/ec2/enable_volume_encryption_test.go
+++ b/checks/cloud/aws/ec2/enable_volume_encryption_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableVolumeEncryption(t *testing.T) {
 			input: ec2.EC2{
 				Volumes: []ec2.Volume{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: ec2.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableVolumeEncryption(t *testing.T) {
 			input: ec2.EC2{
 				Volumes: []ec2.Volume{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: ec2.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ec2/encryption_customer_key_test.go b/checks/cloud/aws/ec2/encryption_customer_key_test.go
index f38c169a..0affec79 100644
--- a/checks/cloud/aws/ec2/encryption_customer_key_test.go
+++ b/checks/cloud/aws/ec2/encryption_customer_key_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: ec2.EC2{
 				Volumes: []ec2.Volume{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: ec2.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: ec2.EC2{
 				Volumes: []ec2.Volume{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: ec2.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("some-kms-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("some-kms-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ec2/enforce_http_token_imds_test.go b/checks/cloud/aws/ec2/enforce_http_token_imds_test.go
index f8e6207f..0d9e8214 100644
--- a/checks/cloud/aws/ec2/enforce_http_token_imds_test.go
+++ b/checks/cloud/aws/ec2/enforce_http_token_imds_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckIMDSAccessRequiresToken(t *testing.T) {
 			input: ec2.EC2{
 				Instances: []ec2.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MetadataOptions: ec2.MetadataOptions{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							HttpTokens:   defsecTypes.String("optional", defsecTypes.NewTestMetadata()),
-							HttpEndpoint: defsecTypes.String("enabled", defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							HttpTokens:   trivyTypes.String("optional", trivyTypes.NewTestMetadata()),
+							HttpEndpoint: trivyTypes.String("enabled", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckIMDSAccessRequiresToken(t *testing.T) {
 			input: ec2.EC2{
 				Instances: []ec2.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MetadataOptions: ec2.MetadataOptions{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							HttpTokens:   defsecTypes.String("required", defsecTypes.NewTestMetadata()),
-							HttpEndpoint: defsecTypes.String("disabled", defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							HttpTokens:   trivyTypes.String("required", trivyTypes.NewTestMetadata()),
+							HttpEndpoint: trivyTypes.String("disabled", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ec2/no_excessive_port_access_test.go b/checks/cloud/aws/ec2/no_excessive_port_access_test.go
index fd96f9ce..f9bcc241 100644
--- a/checks/cloud/aws/ec2/no_excessive_port_access_test.go
+++ b/checks/cloud/aws/ec2/no_excessive_port_access_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
@@ -25,12 +25,12 @@ func TestCheckNoExcessivePortAccess(t *testing.T) {
 			input: ec2.EC2{
 				NetworkACLs: []ec2.NetworkACL{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []ec2.NetworkACLRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("-1", defsecTypes.NewTestMetadata()),
-								Action:   defsecTypes.String("allow", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("-1", trivyTypes.NewTestMetadata()),
+								Action:   trivyTypes.String("allow", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,12 +43,12 @@ func TestCheckNoExcessivePortAccess(t *testing.T) {
 			input: ec2.EC2{
 				NetworkACLs: []ec2.NetworkACL{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []ec2.NetworkACLRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("all", defsecTypes.NewTestMetadata()),
-								Action:   defsecTypes.String("allow", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("all", trivyTypes.NewTestMetadata()),
+								Action:   trivyTypes.String("allow", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -61,13 +61,13 @@ func TestCheckNoExcessivePortAccess(t *testing.T) {
 			input: ec2.EC2{
 				NetworkACLs: []ec2.NetworkACL{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []ec2.NetworkACLRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("tcp", defsecTypes.NewTestMetadata()),
-								Type:     defsecTypes.String("egress", defsecTypes.NewTestMetadata()),
-								Action:   defsecTypes.String("allow", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("tcp", trivyTypes.NewTestMetadata()),
+								Type:     trivyTypes.String("egress", trivyTypes.NewTestMetadata()),
+								Action:   trivyTypes.String("allow", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/ec2/no_public_egress_sgr_test.go b/checks/cloud/aws/ec2/no_public_egress_sgr_test.go
index ade019d1..33dcf709 100644
--- a/checks/cloud/aws/ec2/no_public_egress_sgr_test.go
+++ b/checks/cloud/aws/ec2/no_public_egress_sgr_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
@@ -25,12 +25,12 @@ func TestCheckNoPublicEgressSgr(t *testing.T) {
 			input: ec2.EC2{
 				SecurityGroups: []ec2.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EgressRules: []ec2.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								CIDRs: []defsecTypes.StringValue{
-									defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								CIDRs: []trivyTypes.StringValue{
+									trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -44,12 +44,12 @@ func TestCheckNoPublicEgressSgr(t *testing.T) {
 			input: ec2.EC2{
 				SecurityGroups: []ec2.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EgressRules: []ec2.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								CIDRs: []defsecTypes.StringValue{
-									defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								CIDRs: []trivyTypes.StringValue{
+									trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/aws/ec2/no_public_ingress_acl_test.go b/checks/cloud/aws/ec2/no_public_ingress_acl_test.go
index b61a25a9..dd5b7d95 100644
--- a/checks/cloud/aws/ec2/no_public_ingress_acl_test.go
+++ b/checks/cloud/aws/ec2/no_public_ingress_acl_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
@@ -25,14 +25,14 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: ec2.EC2{
 				NetworkACLs: []ec2.NetworkACL{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []ec2.NetworkACLRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Type:     defsecTypes.String(ec2.TypeIngress, defsecTypes.NewTestMetadata()),
-								Action:   defsecTypes.String(ec2.ActionAllow, defsecTypes.NewTestMetadata()),
-								CIDRs: []defsecTypes.StringValue{
-									defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Type:     trivyTypes.String(ec2.TypeIngress, trivyTypes.NewTestMetadata()),
+								Action:   trivyTypes.String(ec2.ActionAllow, trivyTypes.NewTestMetadata()),
+								CIDRs: []trivyTypes.StringValue{
+									trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -46,14 +46,14 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: ec2.EC2{
 				NetworkACLs: []ec2.NetworkACL{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []ec2.NetworkACLRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Type:     defsecTypes.String(ec2.TypeIngress, defsecTypes.NewTestMetadata()),
-								Action:   defsecTypes.String(ec2.ActionAllow, defsecTypes.NewTestMetadata()),
-								CIDRs: []defsecTypes.StringValue{
-									defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Type:     trivyTypes.String(ec2.TypeIngress, trivyTypes.NewTestMetadata()),
+								Action:   trivyTypes.String(ec2.ActionAllow, trivyTypes.NewTestMetadata()),
+								CIDRs: []trivyTypes.StringValue{
+									trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/aws/ec2/no_public_ingress_sgr_test.go b/checks/cloud/aws/ec2/no_public_ingress_sgr_test.go
index 6d67f9ce..066feab5 100644
--- a/checks/cloud/aws/ec2/no_public_ingress_sgr_test.go
+++ b/checks/cloud/aws/ec2/no_public_ingress_sgr_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
@@ -24,12 +24,12 @@ func TestCheckNoPublicIngressSgr(t *testing.T) {
 			input: ec2.EC2{
 				SecurityGroups: []ec2.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IngressRules: []ec2.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								CIDRs: []defsecTypes.StringValue{
-									defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								CIDRs: []trivyTypes.StringValue{
+									trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -43,12 +43,12 @@ func TestCheckNoPublicIngressSgr(t *testing.T) {
 			input: ec2.EC2{
 				SecurityGroups: []ec2.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IngressRules: []ec2.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								CIDRs: []defsecTypes.StringValue{
-									defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								CIDRs: []trivyTypes.StringValue{
+									trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/aws/ec2/no_public_ip_subnet_test.go b/checks/cloud/aws/ec2/no_public_ip_subnet_test.go
index 6d4fb425..54ad5144 100644
--- a/checks/cloud/aws/ec2/no_public_ip_subnet_test.go
+++ b/checks/cloud/aws/ec2/no_public_ip_subnet_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
@@ -24,8 +24,8 @@ func TestCheckNoPublicIpSubnet(t *testing.T) {
 			input: ec2.EC2{
 				Subnets: []ec2.Subnet{
 					{
-						Metadata:            defsecTypes.NewTestMetadata(),
-						MapPublicIpOnLaunch: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:            trivyTypes.NewTestMetadata(),
+						MapPublicIpOnLaunch: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoPublicIpSubnet(t *testing.T) {
 			input: ec2.EC2{
 				Subnets: []ec2.Subnet{
 					{
-						Metadata:            defsecTypes.NewTestMetadata(),
-						MapPublicIpOnLaunch: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:            trivyTypes.NewTestMetadata(),
+						MapPublicIpOnLaunch: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/ec2/no_public_ip_test.go b/checks/cloud/aws/ec2/no_public_ip_test.go
index 88335417..df6555b7 100644
--- a/checks/cloud/aws/ec2/no_public_ip_test.go
+++ b/checks/cloud/aws/ec2/no_public_ip_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
@@ -24,8 +24,8 @@ func TestCheckNoPublicIp(t *testing.T) {
 			input: ec2.EC2{
 				LaunchConfigurations: []ec2.LaunchConfiguration{
 					{
-						Metadata:          defsecTypes.NewTestMetadata(),
-						AssociatePublicIP: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:          trivyTypes.NewTestMetadata(),
+						AssociatePublicIP: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoPublicIp(t *testing.T) {
 			input: ec2.EC2{
 				LaunchConfigurations: []ec2.LaunchConfiguration{
 					{
-						Metadata:          defsecTypes.NewTestMetadata(),
-						AssociatePublicIP: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:          trivyTypes.NewTestMetadata(),
+						AssociatePublicIP: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/ec2/no_secrets_in_user_data_test.go b/checks/cloud/aws/ec2/no_secrets_in_user_data_test.go
index aeca2882..ca46615d 100644
--- a/checks/cloud/aws/ec2/no_secrets_in_user_data_test.go
+++ b/checks/cloud/aws/ec2/no_secrets_in_user_data_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckNoSecretsInUserData(t *testing.T) {
 			input: ec2.EC2{
 				Instances: []ec2.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						UserData: defsecTypes.String(`<<EOF
+						Metadata: trivyTypes.NewTestMetadata(),
+						UserData: trivyTypes.String(`<<EOF
 						export AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMPLE
 						export AWS_SECRET_ACCESS_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
 						export AWS_DEFAULT_REGION=us-west-2
-						EOF`, defsecTypes.NewTestMetadata()),
+						EOF`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -40,10 +40,10 @@ func TestCheckNoSecretsInUserData(t *testing.T) {
 			input: ec2.EC2{
 				Instances: []ec2.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						UserData: defsecTypes.String(`<<EOF
+						Metadata: trivyTypes.NewTestMetadata(),
+						UserData: trivyTypes.String(`<<EOF
 						export GREETING=hello
-						EOF`, defsecTypes.NewTestMetadata()),
+						EOF`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/ec2/no_sensitive_info_test.go b/checks/cloud/aws/ec2/no_sensitive_info_test.go
index b1b0e4cc..6a0768fa 100644
--- a/checks/cloud/aws/ec2/no_sensitive_info_test.go
+++ b/checks/cloud/aws/ec2/no_sensitive_info_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
@@ -25,12 +25,12 @@ func TestCheckNoSensitiveInfo(t *testing.T) {
 			input: ec2.EC2{
 				LaunchConfigurations: []ec2.LaunchConfiguration{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						UserData: defsecTypes.String(`
+						Metadata: trivyTypes.NewTestMetadata(),
+						UserData: trivyTypes.String(`
 						export AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMPLE
 						export AWS_SECRET_ACCESS_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
 						export AWS_DEFAULT_REGION=us-west-2
-						`, defsecTypes.NewTestMetadata()),
+						`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -41,10 +41,10 @@ func TestCheckNoSensitiveInfo(t *testing.T) {
 			input: ec2.EC2{
 				LaunchConfigurations: []ec2.LaunchConfiguration{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						UserData: defsecTypes.String(`
+						Metadata: trivyTypes.NewTestMetadata(),
+						UserData: trivyTypes.String(`
 						export GREETING=hello
-						`, defsecTypes.NewTestMetadata()),
+						`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs_test.go b/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs_test.go
index c22d4d04..777ee09e 100644
--- a/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs_test.go
+++ b/checks/cloud/aws/ec2/require_vpc_flow_logs_for_all_vpcs_test.go
@@ -3,7 +3,7 @@ package ec2
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
 
@@ -25,9 +25,9 @@ func TestCheckRequireVPCFlowLogs(t *testing.T) {
 			input: ec2.EC2{
 				VPCs: []ec2.VPC{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						ID:              defsecTypes.String("vpc-12345678", defsecTypes.NewTestMetadata()),
-						FlowLogsEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						ID:              trivyTypes.String("vpc-12345678", trivyTypes.NewTestMetadata()),
+						FlowLogsEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -38,9 +38,9 @@ func TestCheckRequireVPCFlowLogs(t *testing.T) {
 			input: ec2.EC2{
 				VPCs: []ec2.VPC{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						ID:              defsecTypes.String("vpc-12345678", defsecTypes.NewTestMetadata()),
-						FlowLogsEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						ID:              trivyTypes.String("vpc-12345678", trivyTypes.NewTestMetadata()),
+						FlowLogsEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/ecr/enable_image_scans_test.go b/checks/cloud/aws/ecr/enable_image_scans_test.go
index 1abe5298..0cf5df66 100644
--- a/checks/cloud/aws/ecr/enable_image_scans_test.go
+++ b/checks/cloud/aws/ecr/enable_image_scans_test.go
@@ -3,7 +3,7 @@ package ecr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableImageScans(t *testing.T) {
 			input: ecr.ECR{
 				Repositories: []ecr.Repository{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ImageScanning: ecr.ImageScanning{
-							Metadata:   defsecTypes.NewTestMetadata(),
-							ScanOnPush: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:   trivyTypes.NewTestMetadata(),
+							ScanOnPush: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableImageScans(t *testing.T) {
 			input: ecr.ECR{
 				Repositories: []ecr.Repository{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ImageScanning: ecr.ImageScanning{
-							Metadata:   defsecTypes.NewTestMetadata(),
-							ScanOnPush: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:   trivyTypes.NewTestMetadata(),
+							ScanOnPush: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ecr/enforce_immutable_repository_test.go b/checks/cloud/aws/ecr/enforce_immutable_repository_test.go
index 51a3bf3d..8ced0b65 100644
--- a/checks/cloud/aws/ecr/enforce_immutable_repository_test.go
+++ b/checks/cloud/aws/ecr/enforce_immutable_repository_test.go
@@ -3,7 +3,7 @@ package ecr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnforceImmutableRepository(t *testing.T) {
 			input: ecr.ECR{
 				Repositories: []ecr.Repository{
 					{
-						Metadata:           defsecTypes.NewTestMetadata(),
-						ImageTagsImmutable: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:           trivyTypes.NewTestMetadata(),
+						ImageTagsImmutable: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnforceImmutableRepository(t *testing.T) {
 			input: ecr.ECR{
 				Repositories: []ecr.Repository{
 					{
-						Metadata:           defsecTypes.NewTestMetadata(),
-						ImageTagsImmutable: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:           trivyTypes.NewTestMetadata(),
+						ImageTagsImmutable: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/ecr/repository_customer_key_test.go b/checks/cloud/aws/ecr/repository_customer_key_test.go
index 816cdbd1..62168c80 100644
--- a/checks/cloud/aws/ecr/repository_customer_key_test.go
+++ b/checks/cloud/aws/ecr/repository_customer_key_test.go
@@ -3,7 +3,7 @@ package ecr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckRepositoryCustomerKey(t *testing.T) {
 			input: ecr.ECR{
 				Repositories: []ecr.Repository{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: ecr.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String(ecr.EncryptionTypeAES256, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String(ecr.EncryptionTypeAES256, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,11 +39,11 @@ func TestCheckRepositoryCustomerKey(t *testing.T) {
 			input: ecr.ECR{
 				Repositories: []ecr.Repository{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: ecr.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String(ecr.EncryptionTypeKMS, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String(ecr.EncryptionTypeKMS, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -55,11 +55,11 @@ func TestCheckRepositoryCustomerKey(t *testing.T) {
 			input: ecr.ECR{
 				Repositories: []ecr.Repository{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: ecr.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String(ecr.EncryptionTypeKMS, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-kms-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String(ecr.EncryptionTypeKMS, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-kms-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ecs/enable_container_insight_test.go b/checks/cloud/aws/ecs/enable_container_insight_test.go
index 1ee6f9e9..9b22491e 100644
--- a/checks/cloud/aws/ecs/enable_container_insight_test.go
+++ b/checks/cloud/aws/ecs/enable_container_insight_test.go
@@ -3,7 +3,7 @@ package ecs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableContainerInsight(t *testing.T) {
 			input: ecs.ECS{
 				Clusters: []ecs.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Settings: ecs.ClusterSettings{
-							Metadata:                 defsecTypes.NewTestMetadata(),
-							ContainerInsightsEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:                 trivyTypes.NewTestMetadata(),
+							ContainerInsightsEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableContainerInsight(t *testing.T) {
 			input: ecs.ECS{
 				Clusters: []ecs.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Settings: ecs.ClusterSettings{
-							Metadata:                 defsecTypes.NewTestMetadata(),
-							ContainerInsightsEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:                 trivyTypes.NewTestMetadata(),
+							ContainerInsightsEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ecs/enable_in_transit_encryption_test.go b/checks/cloud/aws/ecs/enable_in_transit_encryption_test.go
index b691c884..97a29f9c 100644
--- a/checks/cloud/aws/ecs/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/ecs/enable_in_transit_encryption_test.go
@@ -3,7 +3,7 @@ package ecs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: ecs.ECS{
 				TaskDefinitions: []ecs.TaskDefinition{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Volumes: []ecs.Volume{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								EFSVolumeConfiguration: ecs.EFSVolumeConfiguration{
-									Metadata:                 defsecTypes.NewTestMetadata(),
-									TransitEncryptionEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+									Metadata:                 trivyTypes.NewTestMetadata(),
+									TransitEncryptionEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -44,13 +44,13 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: ecs.ECS{
 				TaskDefinitions: []ecs.TaskDefinition{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Volumes: []ecs.Volume{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								EFSVolumeConfiguration: ecs.EFSVolumeConfiguration{
-									Metadata:                 defsecTypes.NewTestMetadata(),
-									TransitEncryptionEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+									Metadata:                 trivyTypes.NewTestMetadata(),
+									TransitEncryptionEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/aws/ecs/no_plaintext_secrets_test.go b/checks/cloud/aws/ecs/no_plaintext_secrets_test.go
index 0da424c6..c9b9c46d 100644
--- a/checks/cloud/aws/ecs/no_plaintext_secrets_test.go
+++ b/checks/cloud/aws/ecs/no_plaintext_secrets_test.go
@@ -3,7 +3,7 @@ package ecs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,15 +24,15 @@ func TestCheckNoPlaintextSecrets(t *testing.T) {
 			input: ecs.ECS{
 				TaskDefinitions: []ecs.TaskDefinition{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ContainerDefinitions: []ecs.ContainerDefinition{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								Name:      defsecTypes.String("my_service", defsecTypes.NewTestMetadata()),
-								Image:     defsecTypes.String("my_image", defsecTypes.NewTestMetadata()),
-								CPU:       defsecTypes.Int(2, defsecTypes.NewTestMetadata()),
-								Memory:    defsecTypes.Int(256, defsecTypes.NewTestMetadata()),
-								Essential: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								Name:      trivyTypes.String("my_service", trivyTypes.NewTestMetadata()),
+								Image:     trivyTypes.String("my_image", trivyTypes.NewTestMetadata()),
+								CPU:       trivyTypes.Int(2, trivyTypes.NewTestMetadata()),
+								Memory:    trivyTypes.Int(256, trivyTypes.NewTestMetadata()),
+								Essential: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 								Environment: []ecs.EnvVar{
 									{
 										Name:  "ENVIRONMENT",
@@ -55,15 +55,15 @@ func TestCheckNoPlaintextSecrets(t *testing.T) {
 			input: ecs.ECS{
 				TaskDefinitions: []ecs.TaskDefinition{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ContainerDefinitions: []ecs.ContainerDefinition{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								Name:      defsecTypes.String("my_service", defsecTypes.NewTestMetadata()),
-								Image:     defsecTypes.String("my_image", defsecTypes.NewTestMetadata()),
-								CPU:       defsecTypes.Int(2, defsecTypes.NewTestMetadata()),
-								Memory:    defsecTypes.Int(256, defsecTypes.NewTestMetadata()),
-								Essential: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								Name:      trivyTypes.String("my_service", trivyTypes.NewTestMetadata()),
+								Image:     trivyTypes.String("my_image", trivyTypes.NewTestMetadata()),
+								CPU:       trivyTypes.Int(2, trivyTypes.NewTestMetadata()),
+								Memory:    trivyTypes.Int(256, trivyTypes.NewTestMetadata()),
+								Essential: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 								Environment: []ecs.EnvVar{
 									{
 										Name:  "ENVIRONMENT",
diff --git a/checks/cloud/aws/efs/enable_at_rest_encryption_test.go b/checks/cloud/aws/efs/enable_at_rest_encryption_test.go
index ce3d3348..e2f74dae 100644
--- a/checks/cloud/aws/efs/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/efs/enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package efs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: efs.EFS{
 				FileSystems: []efs.FileSystem{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						Encrypted: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						Encrypted: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					}},
 			},
 			expected: true,
@@ -35,8 +35,8 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: efs.EFS{
 				FileSystems: []efs.FileSystem{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						Encrypted: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						Encrypted: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					}},
 			},
 			expected: false,
diff --git a/checks/cloud/aws/eks/enable_control_plane_logging_test.go b/checks/cloud/aws/eks/enable_control_plane_logging_test.go
index 2596b5a3..324735fc 100644
--- a/checks/cloud/aws/eks/enable_control_plane_logging_test.go
+++ b/checks/cloud/aws/eks/enable_control_plane_logging_test.go
@@ -3,7 +3,7 @@ package eks
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckEnableControlPlaneLogging(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: eks.Logging{
-							API:               defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							Audit:             defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							Authenticator:     defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							ControllerManager: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							Scheduler:         defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							API:               trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							Audit:             trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							Authenticator:     trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							ControllerManager: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							Scheduler:         trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -42,13 +42,13 @@ func TestCheckEnableControlPlaneLogging(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: eks.Logging{
-							API:               defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							Audit:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Authenticator:     defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							ControllerManager: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Scheduler:         defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							API:               trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							Audit:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Authenticator:     trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							ControllerManager: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Scheduler:         trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -60,13 +60,13 @@ func TestCheckEnableControlPlaneLogging(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: eks.Logging{
-							API:               defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Audit:             defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Authenticator:     defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							ControllerManager: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Scheduler:         defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							API:               trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Audit:             trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Authenticator:     trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							ControllerManager: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Scheduler:         trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/eks/encrypt_secrets_test.go b/checks/cloud/aws/eks/encrypt_secrets_test.go
index ffa0c4e5..38534f85 100644
--- a/checks/cloud/aws/eks/encrypt_secrets_test.go
+++ b/checks/cloud/aws/eks/encrypt_secrets_test.go
@@ -3,7 +3,7 @@ package eks
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEncryptSecrets(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: eks.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Secrets:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Secrets:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckEncryptSecrets(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: eks.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Secrets:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Secrets:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckEncryptSecrets(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: eks.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Secrets:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-arn", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Secrets:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-arn", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/eks/no_public_cluster_access_test.go b/checks/cloud/aws/eks/no_public_cluster_access_test.go
index 7d20ebf5..5d5c8f9d 100644
--- a/checks/cloud/aws/eks/no_public_cluster_access_test.go
+++ b/checks/cloud/aws/eks/no_public_cluster_access_test.go
@@ -3,7 +3,7 @@ package eks
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,7 +24,7 @@ func TestCheckNoPublicClusterAccess(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						PublicAccessEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						PublicAccessEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -35,7 +35,7 @@ func TestCheckNoPublicClusterAccess(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						PublicAccessEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						PublicAccessEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/eks/no_public_cluster_access_to_cidr_test.go b/checks/cloud/aws/eks/no_public_cluster_access_to_cidr_test.go
index 681e4c91..390a0952 100644
--- a/checks/cloud/aws/eks/no_public_cluster_access_to_cidr_test.go
+++ b/checks/cloud/aws/eks/no_public_cluster_access_to_cidr_test.go
@@ -3,7 +3,7 @@ package eks
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckNoPublicClusterAccessToCidr(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						PublicAccessEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						PublicAccessCIDRs: []defsecTypes.StringValue{
-							defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+						PublicAccessEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						PublicAccessCIDRs: []trivyTypes.StringValue{
+							trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -38,9 +38,9 @@ func TestCheckNoPublicClusterAccessToCidr(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						PublicAccessEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						PublicAccessCIDRs: []defsecTypes.StringValue{
-							defsecTypes.String("10.2.0.0/8", defsecTypes.NewTestMetadata()),
+						PublicAccessEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						PublicAccessCIDRs: []trivyTypes.StringValue{
+							trivyTypes.String("10.2.0.0/8", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -52,9 +52,9 @@ func TestCheckNoPublicClusterAccessToCidr(t *testing.T) {
 			input: eks.EKS{
 				Clusters: []eks.Cluster{
 					{
-						PublicAccessEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-						PublicAccessCIDRs: []defsecTypes.StringValue{
-							defsecTypes.String("10.2.0.0/8", defsecTypes.NewTestMetadata()),
+						PublicAccessEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+						PublicAccessCIDRs: []trivyTypes.StringValue{
+							trivyTypes.String("10.2.0.0/8", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/elasticache/add_description_for_security_group_test.go b/checks/cloud/aws/elasticache/add_description_for_security_group_test.go
index f4093acc..8fb3a81f 100644
--- a/checks/cloud/aws/elasticache/add_description_for_security_group_test.go
+++ b/checks/cloud/aws/elasticache/add_description_for_security_group_test.go
@@ -3,7 +3,7 @@ package elasticache
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAddDescriptionForSecurityGroup(t *testing.T) {
 			input: elasticache.ElastiCache{
 				SecurityGroups: []elasticache.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAddDescriptionForSecurityGroup(t *testing.T) {
 			input: elasticache.ElastiCache{
 				SecurityGroups: []elasticache.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("some decent description", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("some decent description", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/elasticache/enable_at_rest_encryption_test.go b/checks/cloud/aws/elasticache/enable_at_rest_encryption_test.go
index e17f0c36..41d5204b 100644
--- a/checks/cloud/aws/elasticache/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/elasticache/enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package elasticache
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: elasticache.ElastiCache{
 				ReplicationGroups: []elasticache.ReplicationGroup{
 					{
-						Metadata:                defsecTypes.NewTestMetadata(),
-						AtRestEncryptionEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:                trivyTypes.NewTestMetadata(),
+						AtRestEncryptionEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: elasticache.ElastiCache{
 				ReplicationGroups: []elasticache.ReplicationGroup{
 					{
-						Metadata:                defsecTypes.NewTestMetadata(),
-						AtRestEncryptionEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                trivyTypes.NewTestMetadata(),
+						AtRestEncryptionEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/elasticache/enable_backup_retention_test.go b/checks/cloud/aws/elasticache/enable_backup_retention_test.go
index e0a8acb9..e1c486ea 100644
--- a/checks/cloud/aws/elasticache/enable_backup_retention_test.go
+++ b/checks/cloud/aws/elasticache/enable_backup_retention_test.go
@@ -3,7 +3,7 @@ package elasticache
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableBackupRetention(t *testing.T) {
 			input: elasticache.ElastiCache{
 				Clusters: []elasticache.Cluster{
 					{
-						Metadata:               defsecTypes.NewTestMetadata(),
-						Engine:                 defsecTypes.String("redis", defsecTypes.NewTestMetadata()),
-						NodeType:               defsecTypes.String("cache.m4.large", defsecTypes.NewTestMetadata()),
-						SnapshotRetentionLimit: defsecTypes.Int(0, defsecTypes.NewTestMetadata()),
+						Metadata:               trivyTypes.NewTestMetadata(),
+						Engine:                 trivyTypes.String("redis", trivyTypes.NewTestMetadata()),
+						NodeType:               trivyTypes.String("cache.m4.large", trivyTypes.NewTestMetadata()),
+						SnapshotRetentionLimit: trivyTypes.Int(0, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -38,10 +38,10 @@ func TestCheckEnableBackupRetention(t *testing.T) {
 			input: elasticache.ElastiCache{
 				Clusters: []elasticache.Cluster{
 					{
-						Metadata:               defsecTypes.NewTestMetadata(),
-						Engine:                 defsecTypes.String("redis", defsecTypes.NewTestMetadata()),
-						NodeType:               defsecTypes.String("cache.m4.large", defsecTypes.NewTestMetadata()),
-						SnapshotRetentionLimit: defsecTypes.Int(5, defsecTypes.NewTestMetadata()),
+						Metadata:               trivyTypes.NewTestMetadata(),
+						Engine:                 trivyTypes.String("redis", trivyTypes.NewTestMetadata()),
+						NodeType:               trivyTypes.String("cache.m4.large", trivyTypes.NewTestMetadata()),
+						SnapshotRetentionLimit: trivyTypes.Int(5, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/elasticache/enable_in_transit_encryption_test.go b/checks/cloud/aws/elasticache/enable_in_transit_encryption_test.go
index 29ce848d..1a8ae0e9 100644
--- a/checks/cloud/aws/elasticache/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/elasticache/enable_in_transit_encryption_test.go
@@ -3,7 +3,7 @@ package elasticache
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: elasticache.ElastiCache{
 				ReplicationGroups: []elasticache.ReplicationGroup{
 					{
-						Metadata:                 defsecTypes.NewTestMetadata(),
-						TransitEncryptionEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:                 trivyTypes.NewTestMetadata(),
+						TransitEncryptionEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: elasticache.ElastiCache{
 				ReplicationGroups: []elasticache.ReplicationGroup{
 					{
-						Metadata:                 defsecTypes.NewTestMetadata(),
-						TransitEncryptionEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                 trivyTypes.NewTestMetadata(),
+						TransitEncryptionEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/elasticsearch/enable_domain_encryption_test.go b/checks/cloud/aws/elasticsearch/enable_domain_encryption_test.go
index 33575b84..6a0fd35f 100644
--- a/checks/cloud/aws/elasticsearch/enable_domain_encryption_test.go
+++ b/checks/cloud/aws/elasticsearch/enable_domain_encryption_test.go
@@ -3,7 +3,7 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableDomainEncryption(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AtRestEncryption: elasticsearch.AtRestEncryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableDomainEncryption(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AtRestEncryption: elasticsearch.AtRestEncryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/elasticsearch/enable_domain_logging_test.go b/checks/cloud/aws/elasticsearch/enable_domain_logging_test.go
index e6f26c16..680fb8e6 100644
--- a/checks/cloud/aws/elasticsearch/enable_domain_logging_test.go
+++ b/checks/cloud/aws/elasticsearch/enable_domain_logging_test.go
@@ -3,7 +3,7 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableDomainLogging(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						LogPublishing: elasticsearch.LogPublishing{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							AuditEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							AuditEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableDomainLogging(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						LogPublishing: elasticsearch.LogPublishing{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							AuditEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							AuditEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/elasticsearch/enable_in_transit_encryption_test.go b/checks/cloud/aws/elasticsearch/enable_in_transit_encryption_test.go
index c089356e..ecbf72c9 100644
--- a/checks/cloud/aws/elasticsearch/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/elasticsearch/enable_in_transit_encryption_test.go
@@ -3,7 +3,7 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						TransitEncryption: elasticsearch.TransitEncryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						TransitEncryption: elasticsearch.TransitEncryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/elasticsearch/enforce_https_test.go b/checks/cloud/aws/elasticsearch/enforce_https_test.go
index 117fa543..06b6a91a 100644
--- a/checks/cloud/aws/elasticsearch/enforce_https_test.go
+++ b/checks/cloud/aws/elasticsearch/enforce_https_test.go
@@ -3,7 +3,7 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Endpoint: elasticsearch.Endpoint{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							EnforceHTTPS: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							EnforceHTTPS: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Endpoint: elasticsearch.Endpoint{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							EnforceHTTPS: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							EnforceHTTPS: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/elasticsearch/use_secure_tls_policy_test.go b/checks/cloud/aws/elasticsearch/use_secure_tls_policy_test.go
index f7c4f016..b1af6726 100644
--- a/checks/cloud/aws/elasticsearch/use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/elasticsearch/use_secure_tls_policy_test.go
@@ -3,7 +3,7 @@ package elasticsearch
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Endpoint: elasticsearch.Endpoint{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							TLSPolicy: defsecTypes.String("Policy-Min-TLS-1-0-2019-07", defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							TLSPolicy: trivyTypes.String("Policy-Min-TLS-1-0-2019-07", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: elasticsearch.Elasticsearch{
 				Domains: []elasticsearch.Domain{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Endpoint: elasticsearch.Endpoint{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							TLSPolicy: defsecTypes.String("Policy-Min-TLS-1-2-2019-07", defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							TLSPolicy: trivyTypes.String("Policy-Min-TLS-1-2-2019-07", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/elb/alb_not_public_test.go b/checks/cloud/aws/elb/alb_not_public_test.go
index b6f1adfe..0915e1cf 100644
--- a/checks/cloud/aws/elb/alb_not_public_test.go
+++ b/checks/cloud/aws/elb/alb_not_public_test.go
@@ -3,7 +3,7 @@ package elb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckAlbNotPublic(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String(elb.TypeApplication, defsecTypes.NewTestMetadata()),
-						Internal: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String(elb.TypeApplication, trivyTypes.NewTestMetadata()),
+						Internal: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -37,9 +37,9 @@ func TestCheckAlbNotPublic(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String(elb.TypeApplication, defsecTypes.NewTestMetadata()),
-						Internal: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String(elb.TypeApplication, trivyTypes.NewTestMetadata()),
+						Internal: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/elb/drop_invalid_headers_test.go b/checks/cloud/aws/elb/drop_invalid_headers_test.go
index a2ce98f1..f57e1ef6 100644
--- a/checks/cloud/aws/elb/drop_invalid_headers_test.go
+++ b/checks/cloud/aws/elb/drop_invalid_headers_test.go
@@ -3,7 +3,7 @@ package elb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckDropInvalidHeaders(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata:                defsecTypes.NewTestMetadata(),
-						Type:                    defsecTypes.String(elb.TypeApplication, defsecTypes.NewTestMetadata()),
-						DropInvalidHeaderFields: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:                trivyTypes.NewTestMetadata(),
+						Type:                    trivyTypes.String(elb.TypeApplication, trivyTypes.NewTestMetadata()),
+						DropInvalidHeaderFields: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -37,9 +37,9 @@ func TestCheckDropInvalidHeaders(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata:                defsecTypes.NewTestMetadata(),
-						Type:                    defsecTypes.String(elb.TypeApplication, defsecTypes.NewTestMetadata()),
-						DropInvalidHeaderFields: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                trivyTypes.NewTestMetadata(),
+						Type:                    trivyTypes.String(elb.TypeApplication, trivyTypes.NewTestMetadata()),
+						DropInvalidHeaderFields: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -49,8 +49,8 @@ func TestCheckDropInvalidHeaders(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String(elb.TypeClassic, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String(elb.TypeClassic, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/elb/http_not_used_test.go b/checks/cloud/aws/elb/http_not_used_test.go
index 8c7ce3ba..f301ecfe 100644
--- a/checks/cloud/aws/elb/http_not_used_test.go
+++ b/checks/cloud/aws/elb/http_not_used_test.go
@@ -3,7 +3,7 @@ package elb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,16 +24,16 @@ func TestCheckHttpNotUsed(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String(elb.TypeApplication, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String(elb.TypeApplication, trivyTypes.NewTestMetadata()),
 						Listeners: []elb.Listener{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("HTTP", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("HTTP", trivyTypes.NewTestMetadata()),
 								DefaultActions: []elb.Action{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("forward", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("forward", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -48,16 +48,16 @@ func TestCheckHttpNotUsed(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String(elb.TypeApplication, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String(elb.TypeApplication, trivyTypes.NewTestMetadata()),
 						Listeners: []elb.Listener{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("HTTP", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("HTTP", trivyTypes.NewTestMetadata()),
 								DefaultActions: []elb.Action{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("redirect", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("redirect", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -72,20 +72,20 @@ func TestCheckHttpNotUsed(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String(elb.TypeApplication, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String(elb.TypeApplication, trivyTypes.NewTestMetadata()),
 						Listeners: []elb.Listener{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("HTTP", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("HTTP", trivyTypes.NewTestMetadata()),
 								DefaultActions: []elb.Action{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("forward", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("forward", trivyTypes.NewTestMetadata()),
 									},
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("redirect", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("redirect", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -100,16 +100,16 @@ func TestCheckHttpNotUsed(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String(elb.TypeApplication, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String(elb.TypeApplication, trivyTypes.NewTestMetadata()),
 						Listeners: []elb.Listener{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("HTTPS", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("HTTPS", trivyTypes.NewTestMetadata()),
 								DefaultActions: []elb.Action{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("forward", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("forward", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/aws/elb/use_secure_tls_policy_test.go b/checks/cloud/aws/elb/use_secure_tls_policy_test.go
index 064fb842..4f46b2c6 100644
--- a/checks/cloud/aws/elb/use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/elb/use_secure_tls_policy_test.go
@@ -3,7 +3,7 @@ package elb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Listeners: []elb.Listener{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								TLSPolicy: defsecTypes.String("ELBSecurityPolicy-TLS-1-0-2015-04", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								TLSPolicy: trivyTypes.String("ELBSecurityPolicy-TLS-1-0-2015-04", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Listeners: []elb.Listener{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								TLSPolicy: defsecTypes.String("ELBSecurityPolicy-TLS-1-2-2017-01", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								TLSPolicy: trivyTypes.String("ELBSecurityPolicy-TLS-1-2-2017-01", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -58,11 +58,11 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: elb.ELB{
 				LoadBalancers: []elb.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Listeners: []elb.Listener{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								TLSPolicy: defsecTypes.String("ELBSecurityPolicy-TLS13-1-2-2021-06", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								TLSPolicy: trivyTypes.String("ELBSecurityPolicy-TLS13-1-2-2021-06", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/emr/enable_at_rest_encryption_test.go b/checks/cloud/aws/emr/enable_at_rest_encryption_test.go
index 62fead0e..50dfd8da 100644
--- a/checks/cloud/aws/emr/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/emr/enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package emr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/emr"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
@@ -22,8 +22,8 @@ func TestEnableAtRestEncryption(t *testing.T) {
 			input: emr.EMR{
 				SecurityConfiguration: []emr.SecurityConfiguration{
 					{
-						Name: defsecTypes.String("test", defsecTypes.NewTestMetadata()),
-						Configuration: defsecTypes.String(`{
+						Name: trivyTypes.String("test", trivyTypes.NewTestMetadata()),
+						Configuration: trivyTypes.String(`{
 							"EncryptionConfiguration": {
 							  "AtRestEncryptionConfiguration": {
 								"S3EncryptionConfiguration": {
@@ -36,7 +36,7 @@ func TestEnableAtRestEncryption(t *testing.T) {
 							  },
 							  "EnableAtRestEncryption": false
 							}
-						  }`, defsecTypes.NewTestMetadata()),
+						  }`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -47,8 +47,8 @@ func TestEnableAtRestEncryption(t *testing.T) {
 			input: emr.EMR{
 				SecurityConfiguration: []emr.SecurityConfiguration{
 					{
-						Name: defsecTypes.String("test", defsecTypes.NewTestMetadata()),
-						Configuration: defsecTypes.String(`{
+						Name: trivyTypes.String("test", trivyTypes.NewTestMetadata()),
+						Configuration: trivyTypes.String(`{
 							"EncryptionConfiguration": {
 							  "AtRestEncryptionConfiguration": {
 								"S3EncryptionConfiguration": {
@@ -61,7 +61,7 @@ func TestEnableAtRestEncryption(t *testing.T) {
 							  },
 							  "EnableAtRestEncryption": true
 							}
-						  }`, defsecTypes.NewTestMetadata()),
+						  }`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/emr/enable_in_transit_encryption_test.go b/checks/cloud/aws/emr/enable_in_transit_encryption_test.go
index b97af56a..ac6dec5b 100644
--- a/checks/cloud/aws/emr/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/emr/enable_in_transit_encryption_test.go
@@ -3,7 +3,7 @@ package emr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/emr"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
@@ -22,8 +22,8 @@ func TestEnableInTransitEncryption(t *testing.T) {
 			input: emr.EMR{
 				SecurityConfiguration: []emr.SecurityConfiguration{
 					{
-						Name: defsecTypes.String("test", defsecTypes.NewTestMetadata()),
-						Configuration: defsecTypes.String(`{
+						Name: trivyTypes.String("test", trivyTypes.NewTestMetadata()),
+						Configuration: trivyTypes.String(`{
 							"EncryptionConfiguration": {
 							  "AtRestEncryptionConfiguration": {
 								"S3EncryptionConfiguration": {
@@ -37,7 +37,7 @@ func TestEnableInTransitEncryption(t *testing.T) {
 							  "EnableInTransitEncryption": false,
 							  "EnableAtRestEncryption": false
 							}
-						  }`, defsecTypes.NewTestMetadata()),
+						  }`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -48,8 +48,8 @@ func TestEnableInTransitEncryption(t *testing.T) {
 			input: emr.EMR{
 				SecurityConfiguration: []emr.SecurityConfiguration{
 					{
-						Name: defsecTypes.String("test", defsecTypes.NewTestMetadata()),
-						Configuration: defsecTypes.String(`{
+						Name: trivyTypes.String("test", trivyTypes.NewTestMetadata()),
+						Configuration: trivyTypes.String(`{
 							"EncryptionConfiguration": {
 							  "AtRestEncryptionConfiguration": {
 								"S3EncryptionConfiguration": {
@@ -63,7 +63,7 @@ func TestEnableInTransitEncryption(t *testing.T) {
 							  "EnableInTransitEncryption": true,
 							  "EnableAtRestEncryption": true
 							}
-						  }`, defsecTypes.NewTestMetadata()),
+						  }`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/emr/enable_local_disk_encryption_test.go b/checks/cloud/aws/emr/enable_local_disk_encryption_test.go
index 8b8ec8fe..b5e03494 100644
--- a/checks/cloud/aws/emr/enable_local_disk_encryption_test.go
+++ b/checks/cloud/aws/emr/enable_local_disk_encryption_test.go
@@ -3,7 +3,7 @@ package emr
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/emr"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
@@ -22,8 +22,8 @@ func TestEnableLocalDiskEncryption(t *testing.T) {
 			input: emr.EMR{
 				SecurityConfiguration: []emr.SecurityConfiguration{
 					{
-						Name: defsecTypes.String("test", defsecTypes.NewTestMetadata()),
-						Configuration: defsecTypes.String(`{
+						Name: trivyTypes.String("test", trivyTypes.NewTestMetadata()),
+						Configuration: trivyTypes.String(`{
 							"EncryptionConfiguration": {
 							  "AtRestEncryptionConfiguration": {
 								"S3EncryptionConfiguration": {
@@ -37,7 +37,7 @@ func TestEnableLocalDiskEncryption(t *testing.T) {
 							  "EnableInTransitEncryption": true,
 							  "EnableAtRestEncryption": true
 							}
-						  }`, defsecTypes.NewTestMetadata()),
+						  }`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -48,8 +48,8 @@ func TestEnableLocalDiskEncryption(t *testing.T) {
 			input: emr.EMR{
 				SecurityConfiguration: []emr.SecurityConfiguration{
 					{
-						Name: defsecTypes.String("test", defsecTypes.NewTestMetadata()),
-						Configuration: defsecTypes.String(`{
+						Name: trivyTypes.String("test", trivyTypes.NewTestMetadata()),
+						Configuration: trivyTypes.String(`{
 							"EncryptionConfiguration": {
 							  "AtRestEncryptionConfiguration": {
 								"S3EncryptionConfiguration": {
@@ -63,7 +63,7 @@ func TestEnableLocalDiskEncryption(t *testing.T) {
 							  "EnableInTransitEncryption": true,
 							  "EnableAtRestEncryption": true
 							}
-						  }`, defsecTypes.NewTestMetadata()),
+						  }`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/iam/disable_unused_credentials_45_test.go b/checks/cloud/aws/iam/disable_unused_credentials_45_test.go
index b47b3ae2..4b856ce0 100644
--- a/checks/cloud/aws/iam/disable_unused_credentials_45_test.go
+++ b/checks/cloud/aws/iam/disable_unused_credentials_45_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,9 +25,9 @@ func TestCheckUnusedCredentialsDisabled45Days(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -38,16 +38,16 @@ func TestCheckUnusedCredentialsDisabled45Days(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -60,9 +60,9 @@ func TestCheckUnusedCredentialsDisabled45Days(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.Time(time.Now().Add(-time.Hour*24*50), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.Time(time.Now().Add(-time.Hour*24*50), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -73,16 +73,16 @@ func TestCheckUnusedCredentialsDisabled45Days(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*120), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now().Add(-time.Hour*24*50), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*120), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now().Add(-time.Hour*24*50), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -95,16 +95,16 @@ func TestCheckUnusedCredentialsDisabled45Days(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*120), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now().Add(-time.Hour*24*50), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*120), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now().Add(-time.Hour*24*50), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/iam/disable_unused_credentials_test.go b/checks/cloud/aws/iam/disable_unused_credentials_test.go
index 4cfcec15..9a5f6164 100644
--- a/checks/cloud/aws/iam/disable_unused_credentials_test.go
+++ b/checks/cloud/aws/iam/disable_unused_credentials_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,9 +25,9 @@ func TestCheckUnusedCredentialsDisabled(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -38,16 +38,16 @@ func TestCheckUnusedCredentialsDisabled(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -60,9 +60,9 @@ func TestCheckUnusedCredentialsDisabled(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.Time(time.Now().Add(-time.Hour*24*100), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.Time(time.Now().Add(-time.Hour*24*100), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -73,16 +73,16 @@ func TestCheckUnusedCredentialsDisabled(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*120), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now().Add(-time.Hour*24*100), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*120), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now().Add(-time.Hour*24*100), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -95,16 +95,16 @@ func TestCheckUnusedCredentialsDisabled(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*120), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now().Add(-time.Hour*24*100), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*120), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now().Add(-time.Hour*24*100), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/iam/enforce_root_mfa_test.go b/checks/cloud/aws/iam/enforce_root_mfa_test.go
index ad212965..95a38c7b 100644
--- a/checks/cloud/aws/iam/enforce_root_mfa_test.go
+++ b/checks/cloud/aws/iam/enforce_root_mfa_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckRootMFAEnabled(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("root", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("root", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckRootMFAEnabled(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("other", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("other", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -48,12 +48,12 @@ func TestCheckRootMFAEnabled(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("root", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("root", trivyTypes.NewTestMetadata()),
 						MFADevices: []iam.MFADevice{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsVirtual: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsVirtual: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/iam/enforce_user_mfa_test.go b/checks/cloud/aws/iam/enforce_user_mfa_test.go
index cac48d90..96e760b7 100644
--- a/checks/cloud/aws/iam/enforce_user_mfa_test.go
+++ b/checks/cloud/aws/iam/enforce_user_mfa_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,9 +25,9 @@ func TestCheckEnforceUserMFA(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("other", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("other", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -38,9 +38,9 @@ func TestCheckEnforceUserMFA(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("other", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("other", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -51,12 +51,12 @@ func TestCheckEnforceUserMFA(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("root", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("root", trivyTypes.NewTestMetadata()),
 						MFADevices: []iam.MFADevice{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsVirtual: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsVirtual: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/iam/limit_root_account_usage_test.go b/checks/cloud/aws/iam/limit_root_account_usage_test.go
index c66357a0..7ba21d2c 100644
--- a/checks/cloud/aws/iam/limit_root_account_usage_test.go
+++ b/checks/cloud/aws/iam/limit_root_account_usage_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,9 +25,9 @@ func TestCheckLimitRootAccountUsage(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("root", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("root", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -38,9 +38,9 @@ func TestCheckLimitRootAccountUsage(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("other", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.Time(time.Now().Add(-time.Hour*24*90), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("other", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.Time(time.Now().Add(-time.Hour*24*90), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -51,9 +51,9 @@ func TestCheckLimitRootAccountUsage(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("root", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.Time(time.Now().Add(-time.Hour), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("root", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.Time(time.Now().Add(-time.Hour), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -64,9 +64,9 @@ func TestCheckLimitRootAccountUsage(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("other", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.Time(time.Now().Add(-time.Hour), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("other", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.Time(time.Now().Add(-time.Hour), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/iam/limit_user_access_keys_test.go b/checks/cloud/aws/iam/limit_user_access_keys_test.go
index bb8d89ea..76405660 100644
--- a/checks/cloud/aws/iam/limit_user_access_keys_test.go
+++ b/checks/cloud/aws/iam/limit_user_access_keys_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,16 +25,16 @@ func TestCheckLimitUserAccessKeys(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -47,23 +47,23 @@ func TestCheckLimitUserAccessKeys(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -76,23 +76,23 @@ func TestCheckLimitUserAccessKeys(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -105,23 +105,23 @@ func TestCheckLimitUserAccessKeys(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/iam/no_password_reuse_test.go b/checks/cloud/aws/iam/no_password_reuse_test.go
index f96eb02b..53bf316c 100644
--- a/checks/cloud/aws/iam/no_password_reuse_test.go
+++ b/checks/cloud/aws/iam/no_password_reuse_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckNoPasswordReuse(t *testing.T) {
 			name: "IAM with 1 password that can't be reused (min)",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:             defsecTypes.NewTestMetadata(),
-					ReusePreventionCount: defsecTypes.Int(1, defsecTypes.NewTestMetadata()),
+					Metadata:             trivyTypes.NewTestMetadata(),
+					ReusePreventionCount: trivyTypes.Int(1, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckNoPasswordReuse(t *testing.T) {
 			name: "IAM with 5 passwords that can't be reused",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:             defsecTypes.NewTestMetadata(),
-					ReusePreventionCount: defsecTypes.Int(5, defsecTypes.NewTestMetadata()),
+					Metadata:             trivyTypes.NewTestMetadata(),
+					ReusePreventionCount: trivyTypes.Int(5, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/aws/iam/no_policy_wildcards_test.go b/checks/cloud/aws/iam/no_policy_wildcards_test.go
index 516f8e1d..76112498 100644
--- a/checks/cloud/aws/iam/no_policy_wildcards_test.go
+++ b/checks/cloud/aws/iam/no_policy_wildcards_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/liamg/iamgo"
 	"github.com/stretchr/testify/assert"
 )
@@ -22,10 +22,10 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 			input: iam.IAM{
 				Roles: []iam.Role{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Policies: []iam.Policy{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Document: func() iam.Document {
 
 									builder := iamgo.NewPolicyBuilder()
@@ -42,10 +42,10 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 
 									return iam.Document{
 										Parsed:   builder.Build(),
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 									}
 								}(),
-								Builtin: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Builtin: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -58,10 +58,10 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 			input: iam.IAM{
 				Roles: []iam.Role{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Policies: []iam.Policy{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Document: func() iam.Document {
 
 									builder := iamgo.NewPolicyBuilder()
@@ -78,10 +78,10 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 
 									return iam.Document{
 										Parsed:   builder.Build(),
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 									}
 								}(),
-								Builtin: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Builtin: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -94,7 +94,7 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 			input: iam.IAM{
 				Policies: []iam.Policy{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Document: func() iam.Document {
 
 							builder := iamgo.NewPolicyBuilder()
@@ -111,10 +111,10 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 
 							return iam.Document{
 								Parsed:   builder.Build(),
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 							}
 						}(),
-						Builtin: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Builtin: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -125,7 +125,7 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 			input: iam.IAM{
 				Policies: []iam.Policy{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Document: func() iam.Document {
 
 							builder := iamgo.NewPolicyBuilder()
@@ -141,18 +141,18 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 
 							return iam.Document{
 								Parsed:   builder.Build(),
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 							}
 						}(),
-						Builtin: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Builtin: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 				Roles: []iam.Role{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Policies: []iam.Policy{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Document: func() iam.Document {
 
 									builder := iamgo.NewPolicyBuilder()
@@ -167,10 +167,10 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 
 									return iam.Document{
 										Parsed:   builder.Build(),
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 									}
 								}(),
-								Builtin: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Builtin: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -183,7 +183,7 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 			input: iam.IAM{
 				Policies: []iam.Policy{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Document: func() iam.Document {
 
 							builder := iamgo.NewPolicyBuilder()
@@ -199,18 +199,18 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 
 							return iam.Document{
 								Parsed:   builder.Build(),
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 							}
 						}(),
-						Builtin: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Builtin: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 				Roles: []iam.Role{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Policies: []iam.Policy{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Document: func() iam.Document {
 
 									builder := iamgo.NewPolicyBuilder()
@@ -225,10 +225,10 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 
 									return iam.Document{
 										Parsed:   builder.Build(),
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 									}
 								}(),
-								Builtin: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Builtin: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -241,7 +241,7 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 			input: iam.IAM{
 				Policies: []iam.Policy{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Document: func() iam.Document {
 
 							builder := iamgo.NewPolicyBuilder()
@@ -257,18 +257,18 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 
 							return iam.Document{
 								Parsed:   builder.Build(),
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 							}
 						}(),
-						Builtin: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Builtin: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 				Roles: []iam.Role{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Policies: []iam.Policy{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Document: func() iam.Document {
 
 									builder := iamgo.NewPolicyBuilder()
@@ -283,10 +283,10 @@ func TestCheckNoPolicyWildcards(t *testing.T) {
 
 									return iam.Document{
 										Parsed:   builder.Build(),
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 									}
 								}(),
-								Builtin: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Builtin: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/iam/no_root_access_keys_test.go b/checks/cloud/aws/iam/no_root_access_keys_test.go
index 7b4a182b..dbd5c634 100644
--- a/checks/cloud/aws/iam/no_root_access_keys_test.go
+++ b/checks/cloud/aws/iam/no_root_access_keys_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoRootAccessKeys(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("root", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("root", trivyTypes.NewTestMetadata()),
 						AccessKeys: nil,
 					},
 				},
@@ -37,8 +37,8 @@ func TestCheckNoRootAccessKeys(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("other", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("other", trivyTypes.NewTestMetadata()),
 						AccessKeys: nil,
 					},
 				},
@@ -50,15 +50,15 @@ func TestCheckNoRootAccessKeys(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("other", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("other", trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("BLAH", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("BLAH", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -71,15 +71,15 @@ func TestCheckNoRootAccessKeys(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("root", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("root", trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("BLAH", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("BLAH", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -92,15 +92,15 @@ func TestCheckNoRootAccessKeys(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("root", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("root", trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("BLAH", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("BLAH", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/iam/no_user_attached_policies_test.go b/checks/cloud/aws/iam/no_user_attached_policies_test.go
index b6941aee..7f142617 100644
--- a/checks/cloud/aws/iam/no_user_attached_policies_test.go
+++ b/checks/cloud/aws/iam/no_user_attached_policies_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoUserAttachedPolicies(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("example", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("example", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,14 +36,14 @@ func TestCheckNoUserAttachedPolicies(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("example", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("example", trivyTypes.NewTestMetadata()),
 						Policies: []iam.Policy{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Name:     defsecTypes.String("another.policy", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Name:     trivyTypes.String("another.policy", trivyTypes.NewTestMetadata()),
 								Document: iam.Document{
-									Metadata: defsecTypes.NewTestMetadata(),
+									Metadata: trivyTypes.NewTestMetadata(),
 								},
 							},
 						},
diff --git a/checks/cloud/aws/iam/remove_expired_certificates_test.go b/checks/cloud/aws/iam/remove_expired_certificates_test.go
index f9bd5ced..4ab10e95 100644
--- a/checks/cloud/aws/iam/remove_expired_certificates_test.go
+++ b/checks/cloud/aws/iam/remove_expired_certificates_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
@@ -29,8 +29,8 @@ func TestCheckRemoveExpiredCertificates(t *testing.T) {
 			input: iam.IAM{
 				ServerCertificates: []iam.ServerCertificate{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Expiration: defsecTypes.Time(time.Now().Add(time.Hour), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Expiration: trivyTypes.Time(time.Now().Add(time.Hour), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -41,8 +41,8 @@ func TestCheckRemoveExpiredCertificates(t *testing.T) {
 			input: iam.IAM{
 				ServerCertificates: []iam.ServerCertificate{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Expiration: defsecTypes.Time(time.Now().Add(-time.Hour), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Expiration: trivyTypes.Time(time.Now().Add(-time.Hour), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/iam/require_lowercase_in_passwords_test.go b/checks/cloud/aws/iam/require_lowercase_in_passwords_test.go
index f988708a..c4b499c3 100644
--- a/checks/cloud/aws/iam/require_lowercase_in_passwords_test.go
+++ b/checks/cloud/aws/iam/require_lowercase_in_passwords_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckRequireLowercaseInPasswords(t *testing.T) {
 			name: "IAM password policy lowercase not required",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:         defsecTypes.NewTestMetadata(),
-					RequireLowercase: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata:         trivyTypes.NewTestMetadata(),
+					RequireLowercase: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckRequireLowercaseInPasswords(t *testing.T) {
 			name: "IAM password policy lowercase required",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:         defsecTypes.NewTestMetadata(),
-					RequireLowercase: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+					Metadata:         trivyTypes.NewTestMetadata(),
+					RequireLowercase: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/aws/iam/require_numbers_in_passwords_test.go b/checks/cloud/aws/iam/require_numbers_in_passwords_test.go
index 2304a792..20b8fcdf 100644
--- a/checks/cloud/aws/iam/require_numbers_in_passwords_test.go
+++ b/checks/cloud/aws/iam/require_numbers_in_passwords_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckRequireNumbersInPasswords(t *testing.T) {
 			name: "IAM password policy numbers not required",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:       defsecTypes.NewTestMetadata(),
-					RequireNumbers: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata:       trivyTypes.NewTestMetadata(),
+					RequireNumbers: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckRequireNumbersInPasswords(t *testing.T) {
 			name: "IAM password policy numbers required",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:       defsecTypes.NewTestMetadata(),
-					RequireNumbers: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+					Metadata:       trivyTypes.NewTestMetadata(),
+					RequireNumbers: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/aws/iam/require_support_role.go b/checks/cloud/aws/iam/require_support_role.go
index dfc793ed..8a820234 100644
--- a/checks/cloud/aws/iam/require_support_role.go
+++ b/checks/cloud/aws/iam/require_support_role.go
@@ -2,7 +2,7 @@ package iam
 
 import (
 	"github.com/aquasecurity/trivy/pkg/iac/framework"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/severity"
 
@@ -47,7 +47,7 @@ IAM Policy to allow Support Center Access in order to manage Incidents with AWS
 			}
 		}
 
-		results.Add("Missing IAM support role.", defsecTypes.NewUnmanagedMetadata())
+		results.Add("Missing IAM support role.", trivyTypes.NewUnmanagedMetadata())
 		return results
 	},
 )
diff --git a/checks/cloud/aws/iam/require_support_role_test.go b/checks/cloud/aws/iam/require_support_role_test.go
index e10de05e..a6e4dbdd 100644
--- a/checks/cloud/aws/iam/require_support_role_test.go
+++ b/checks/cloud/aws/iam/require_support_role_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
@@ -28,13 +28,13 @@ func TestCheckRequireSupportRole(t *testing.T) {
 			input: iam.IAM{
 				Roles: []iam.Role{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("example", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("example", trivyTypes.NewTestMetadata()),
 						Policies: []iam.Policy{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Builtin:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								Name:     defsecTypes.String("AWSSupportRole", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Builtin:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								Name:     trivyTypes.String("AWSSupportRole", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/iam/require_symbols_in_passwords_test.go b/checks/cloud/aws/iam/require_symbols_in_passwords_test.go
index ca08053e..44900017 100644
--- a/checks/cloud/aws/iam/require_symbols_in_passwords_test.go
+++ b/checks/cloud/aws/iam/require_symbols_in_passwords_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckRequireSymbolsInPasswords(t *testing.T) {
 			name: "IAM password policy symbols not required",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:       defsecTypes.NewTestMetadata(),
-					RequireSymbols: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata:       trivyTypes.NewTestMetadata(),
+					RequireSymbols: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckRequireSymbolsInPasswords(t *testing.T) {
 			name: "IAM password policy symbols required",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:       defsecTypes.NewTestMetadata(),
-					RequireSymbols: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+					Metadata:       trivyTypes.NewTestMetadata(),
+					RequireSymbols: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/aws/iam/require_uppercase_in_passwords_test.go b/checks/cloud/aws/iam/require_uppercase_in_passwords_test.go
index 67d49cb0..e60be0f4 100644
--- a/checks/cloud/aws/iam/require_uppercase_in_passwords_test.go
+++ b/checks/cloud/aws/iam/require_uppercase_in_passwords_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckRequireUppercaseInPasswords(t *testing.T) {
 			name: "IAM password policy uppercase not required",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:         defsecTypes.NewTestMetadata(),
-					RequireUppercase: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata:         trivyTypes.NewTestMetadata(),
+					RequireUppercase: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckRequireUppercaseInPasswords(t *testing.T) {
 			name: "IAM password policy uppercase required",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:         defsecTypes.NewTestMetadata(),
-					RequireUppercase: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+					Metadata:         trivyTypes.NewTestMetadata(),
+					RequireUppercase: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/aws/iam/rotate_access_keys_test.go b/checks/cloud/aws/iam/rotate_access_keys_test.go
index 5d25169b..d56d9fc8 100644
--- a/checks/cloud/aws/iam/rotate_access_keys_test.go
+++ b/checks/cloud/aws/iam/rotate_access_keys_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,16 +25,16 @@ func TestCheckAccessKeysRotated(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -47,16 +47,16 @@ func TestCheckAccessKeysRotated(t *testing.T) {
 			input: iam.IAM{
 				Users: []iam.User{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Name:       defsecTypes.String("user", defsecTypes.NewTestMetadata()),
-						LastAccess: defsecTypes.TimeUnresolvable(defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Name:       trivyTypes.String("user", trivyTypes.NewTestMetadata()),
+						LastAccess: trivyTypes.TimeUnresolvable(trivyTypes.NewTestMetadata()),
 						AccessKeys: []iam.AccessKey{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								AccessKeyId:  defsecTypes.String("AKIACKCEVSQ6C2EXAMPLE", defsecTypes.NewTestMetadata()),
-								Active:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CreationDate: defsecTypes.Time(time.Now().Add(-time.Hour*24*30*4), defsecTypes.NewTestMetadata()),
-								LastAccess:   defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								AccessKeyId:  trivyTypes.String("AKIACKCEVSQ6C2EXAMPLE", trivyTypes.NewTestMetadata()),
+								Active:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CreationDate: trivyTypes.Time(time.Now().Add(-time.Hour*24*30*4), trivyTypes.NewTestMetadata()),
+								LastAccess:   trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/iam/set_max_password_age_test.go b/checks/cloud/aws/iam/set_max_password_age_test.go
index 40c695c6..2cb93d81 100644
--- a/checks/cloud/aws/iam/set_max_password_age_test.go
+++ b/checks/cloud/aws/iam/set_max_password_age_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckSetMaxPasswordAge(t *testing.T) {
 			name: "Password expires in 99 days",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:   defsecTypes.NewTestMetadata(),
-					MaxAgeDays: defsecTypes.Int(99, defsecTypes.NewTestMetadata()),
+					Metadata:   trivyTypes.NewTestMetadata(),
+					MaxAgeDays: trivyTypes.Int(99, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckSetMaxPasswordAge(t *testing.T) {
 			name: "Password expires in 60 days",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:   defsecTypes.NewTestMetadata(),
-					MaxAgeDays: defsecTypes.Int(60, defsecTypes.NewTestMetadata()),
+					Metadata:   trivyTypes.NewTestMetadata(),
+					MaxAgeDays: trivyTypes.Int(60, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/aws/iam/set_minimum_password_length_test.go b/checks/cloud/aws/iam/set_minimum_password_length_test.go
index d1b3512d..cfdc8764 100644
--- a/checks/cloud/aws/iam/set_minimum_password_length_test.go
+++ b/checks/cloud/aws/iam/set_minimum_password_length_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckSetMinimumPasswordLength(t *testing.T) {
 			name: "Minimum password length set to 8",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:      defsecTypes.NewTestMetadata(),
-					MinimumLength: defsecTypes.Int(8, defsecTypes.NewTestMetadata()),
+					Metadata:      trivyTypes.NewTestMetadata(),
+					MinimumLength: trivyTypes.Int(8, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckSetMinimumPasswordLength(t *testing.T) {
 			name: "Minimum password length set to 15",
 			input: iam.IAM{
 				PasswordPolicy: iam.PasswordPolicy{
-					Metadata:      defsecTypes.NewTestMetadata(),
-					MinimumLength: defsecTypes.Int(15, defsecTypes.NewTestMetadata()),
+					Metadata:      trivyTypes.NewTestMetadata(),
+					MinimumLength: trivyTypes.Int(15, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/aws/kinesis/enable_in_transit_encryption_test.go b/checks/cloud/aws/kinesis/enable_in_transit_encryption_test.go
index 71eea507..bfc5cdcc 100644
--- a/checks/cloud/aws/kinesis/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/kinesis/enable_in_transit_encryption_test.go
@@ -3,7 +3,7 @@ package kinesis
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: kinesis.Kinesis{
 				Streams: []kinesis.Stream{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: kinesis.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String("NONE", defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String("NONE", trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: kinesis.Kinesis{
 				Streams: []kinesis.Stream{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: kinesis.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String(kinesis.EncryptionTypeKMS, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String(kinesis.EncryptionTypeKMS, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: kinesis.Kinesis{
 				Streams: []kinesis.Stream{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: kinesis.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Type:     defsecTypes.String(kinesis.EncryptionTypeKMS, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Type:     trivyTypes.String(kinesis.EncryptionTypeKMS, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/kms/auto_rotate_keys_test.go b/checks/cloud/aws/kms/auto_rotate_keys_test.go
index 390349bf..35ccaf40 100644
--- a/checks/cloud/aws/kms/auto_rotate_keys_test.go
+++ b/checks/cloud/aws/kms/auto_rotate_keys_test.go
@@ -3,7 +3,7 @@ package kms
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAutoRotateKeys(t *testing.T) {
 			input: kms.KMS{
 				Keys: []kms.Key{
 					{
-						Usage:           defsecTypes.String("ENCRYPT_DECRYPT", defsecTypes.NewTestMetadata()),
-						RotationEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Usage:           trivyTypes.String("ENCRYPT_DECRYPT", trivyTypes.NewTestMetadata()),
+						RotationEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAutoRotateKeys(t *testing.T) {
 			input: kms.KMS{
 				Keys: []kms.Key{
 					{
-						Usage:           defsecTypes.String("ENCRYPT_DECRYPT", defsecTypes.NewTestMetadata()),
-						RotationEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Usage:           trivyTypes.String("ENCRYPT_DECRYPT", trivyTypes.NewTestMetadata()),
+						RotationEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -48,8 +48,8 @@ func TestCheckAutoRotateKeys(t *testing.T) {
 			input: kms.KMS{
 				Keys: []kms.Key{
 					{
-						Usage:           defsecTypes.String(kms.KeyUsageSignAndVerify, defsecTypes.NewTestMetadata()),
-						RotationEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Usage:           trivyTypes.String(kms.KeyUsageSignAndVerify, trivyTypes.NewTestMetadata()),
+						RotationEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/lambda/enable_tracing_test.go b/checks/cloud/aws/lambda/enable_tracing_test.go
index 9dd5a732..e9a504a7 100644
--- a/checks/cloud/aws/lambda/enable_tracing_test.go
+++ b/checks/cloud/aws/lambda/enable_tracing_test.go
@@ -3,7 +3,7 @@ package lambda
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableTracing(t *testing.T) {
 			input: lambda.Lambda{
 				Functions: []lambda.Function{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Tracing: lambda.Tracing{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Mode:     defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Mode:     trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableTracing(t *testing.T) {
 			input: lambda.Lambda{
 				Functions: []lambda.Function{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Tracing: lambda.Tracing{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Mode:     defsecTypes.String(lambda.TracingModeActive, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Mode:     trivyTypes.String(lambda.TracingModeActive, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/lambda/restrict_source_arn_test.go b/checks/cloud/aws/lambda/restrict_source_arn_test.go
index 1706b7ad..cd18eeb0 100644
--- a/checks/cloud/aws/lambda/restrict_source_arn_test.go
+++ b/checks/cloud/aws/lambda/restrict_source_arn_test.go
@@ -3,7 +3,7 @@ package lambda
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckRestrictSourceArn(t *testing.T) {
 			input: lambda.Lambda{
 				Functions: []lambda.Function{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Permissions: []lambda.Permission{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								Principal: defsecTypes.String("sns.amazonaws.com", defsecTypes.NewTestMetadata()),
-								SourceARN: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								Principal: trivyTypes.String("sns.amazonaws.com", trivyTypes.NewTestMetadata()),
+								SourceARN: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,12 +42,12 @@ func TestCheckRestrictSourceArn(t *testing.T) {
 			input: lambda.Lambda{
 				Functions: []lambda.Function{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Permissions: []lambda.Permission{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								Principal: defsecTypes.String("sns.amazonaws.com", defsecTypes.NewTestMetadata()),
-								SourceARN: defsecTypes.String("source-arn", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								Principal: trivyTypes.String("sns.amazonaws.com", trivyTypes.NewTestMetadata()),
+								SourceARN: trivyTypes.String("source-arn", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/aws/mq/enable_audit_logging_test.go b/checks/cloud/aws/mq/enable_audit_logging_test.go
index a2fcc8b0..2dfd1033 100644
--- a/checks/cloud/aws/mq/enable_audit_logging_test.go
+++ b/checks/cloud/aws/mq/enable_audit_logging_test.go
@@ -3,7 +3,7 @@ package mq
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableAuditLogging(t *testing.T) {
 			input: mq.MQ{
 				Brokers: []mq.Broker{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: mq.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Audit:    defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Audit:    trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableAuditLogging(t *testing.T) {
 			input: mq.MQ{
 				Brokers: []mq.Broker{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: mq.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Audit:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Audit:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/mq/enable_general_logging_test.go b/checks/cloud/aws/mq/enable_general_logging_test.go
index c7b57fc8..04418ff2 100644
--- a/checks/cloud/aws/mq/enable_general_logging_test.go
+++ b/checks/cloud/aws/mq/enable_general_logging_test.go
@@ -3,7 +3,7 @@ package mq
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableGeneralLogging(t *testing.T) {
 			input: mq.MQ{
 				Brokers: []mq.Broker{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: mq.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							General:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							General:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableGeneralLogging(t *testing.T) {
 			input: mq.MQ{
 				Brokers: []mq.Broker{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: mq.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							General:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							General:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/mq/no_public_access_test.go b/checks/cloud/aws/mq/no_public_access_test.go
index ba762815..f2241c5a 100644
--- a/checks/cloud/aws/mq/no_public_access_test.go
+++ b/checks/cloud/aws/mq/no_public_access_test.go
@@ -3,7 +3,7 @@ package mq
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: mq.MQ{
 				Brokers: []mq.Broker{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						PublicAccess: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						PublicAccess: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: mq.MQ{
 				Brokers: []mq.Broker{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						PublicAccess: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						PublicAccess: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/msk/enable_at_rest_encryption_test.go b/checks/cloud/aws/msk/enable_at_rest_encryption_test.go
index e3ee6eae..af36c38c 100644
--- a/checks/cloud/aws/msk/enable_at_rest_encryption_test.go
+++ b/checks/cloud/aws/msk/enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package msk
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: msk.MSK{
 				Clusters: []msk.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EncryptionAtRest: msk.EncryptionAtRest{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							KMSKeyARN: defsecTypes.String("foo-bar-key", defsecTypes.NewTestMetadata()),
-							Enabled:   defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							KMSKeyARN: trivyTypes.String("foo-bar-key", trivyTypes.NewTestMetadata()),
+							Enabled:   trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,7 +40,7 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: msk.MSK{
 				Clusters: []msk.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/msk/enable_in_transit_encryption_test.go b/checks/cloud/aws/msk/enable_in_transit_encryption_test.go
index 5343a0ca..4852cd0c 100644
--- a/checks/cloud/aws/msk/enable_in_transit_encryption_test.go
+++ b/checks/cloud/aws/msk/enable_in_transit_encryption_test.go
@@ -3,7 +3,7 @@ package msk
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: msk.MSK{
 				Clusters: []msk.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EncryptionInTransit: msk.EncryptionInTransit{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							ClientBroker: defsecTypes.String(msk.ClientBrokerEncryptionPlaintext, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							ClientBroker: trivyTypes.String(msk.ClientBrokerEncryptionPlaintext, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: msk.MSK{
 				Clusters: []msk.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EncryptionInTransit: msk.EncryptionInTransit{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							ClientBroker: defsecTypes.String(msk.ClientBrokerEncryptionTLSOrPlaintext, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							ClientBroker: trivyTypes.String(msk.ClientBrokerEncryptionTLSOrPlaintext, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -54,10 +54,10 @@ func TestCheckEnableInTransitEncryption(t *testing.T) {
 			input: msk.MSK{
 				Clusters: []msk.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EncryptionInTransit: msk.EncryptionInTransit{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							ClientBroker: defsecTypes.String(msk.ClientBrokerEncryptionTLS, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							ClientBroker: trivyTypes.String(msk.ClientBrokerEncryptionTLS, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/msk/enable_logging_test.go b/checks/cloud/aws/msk/enable_logging_test.go
index 43e2b28c..fe52bf5d 100644
--- a/checks/cloud/aws/msk/enable_logging_test.go
+++ b/checks/cloud/aws/msk/enable_logging_test.go
@@ -3,7 +3,7 @@ package msk
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,22 +24,22 @@ func TestCheckEnableLogging(t *testing.T) {
 			input: msk.MSK{
 				Clusters: []msk.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: msk.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Broker: msk.BrokerLogging{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								S3: msk.S3Logging{
-									Metadata: defsecTypes.NewTestMetadata(),
-									Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								},
 								Cloudwatch: msk.CloudwatchLogging{
-									Metadata: defsecTypes.NewTestMetadata(),
-									Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								},
 								Firehose: msk.FirehoseLogging{
-									Metadata: defsecTypes.NewTestMetadata(),
-									Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -53,22 +53,22 @@ func TestCheckEnableLogging(t *testing.T) {
 			input: msk.MSK{
 				Clusters: []msk.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: msk.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Broker: msk.BrokerLogging{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								S3: msk.S3Logging{
-									Metadata: defsecTypes.NewTestMetadata(),
-									Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 								},
 								Cloudwatch: msk.CloudwatchLogging{
-									Metadata: defsecTypes.NewTestMetadata(),
-									Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								},
 								Firehose: msk.FirehoseLogging{
-									Metadata: defsecTypes.NewTestMetadata(),
-									Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/aws/neptune/enable_log_export_test.go b/checks/cloud/aws/neptune/enable_log_export_test.go
index d448c11f..7ec920a1 100644
--- a/checks/cloud/aws/neptune/enable_log_export_test.go
+++ b/checks/cloud/aws/neptune/enable_log_export_test.go
@@ -3,7 +3,7 @@ package neptune
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableLogExport(t *testing.T) {
 			input: neptune.Neptune{
 				Clusters: []neptune.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: neptune.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Audit:    defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Audit:    trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableLogExport(t *testing.T) {
 			input: neptune.Neptune{
 				Clusters: []neptune.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Logging: neptune.Logging{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Audit:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Audit:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/neptune/enable_storage_encryption_test.go b/checks/cloud/aws/neptune/enable_storage_encryption_test.go
index 22bdc448..93f26a56 100644
--- a/checks/cloud/aws/neptune/enable_storage_encryption_test.go
+++ b/checks/cloud/aws/neptune/enable_storage_encryption_test.go
@@ -3,7 +3,7 @@ package neptune
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableStorageEncryption(t *testing.T) {
 			input: neptune.Neptune{
 				Clusters: []neptune.Cluster{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						StorageEncrypted: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						StorageEncrypted: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableStorageEncryption(t *testing.T) {
 			input: neptune.Neptune{
 				Clusters: []neptune.Cluster{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						StorageEncrypted: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						StorageEncrypted: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/neptune/encryption_customer_key_test.go b/checks/cloud/aws/neptune/encryption_customer_key_test.go
index ace7e3c7..4a873ef9 100644
--- a/checks/cloud/aws/neptune/encryption_customer_key_test.go
+++ b/checks/cloud/aws/neptune/encryption_customer_key_test.go
@@ -3,7 +3,7 @@ package neptune
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: neptune.Neptune{
 				Clusters: []neptune.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: neptune.Neptune{
 				Clusters: []neptune.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("some-kms-key", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("some-kms-key", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/rds/enable_performance_insights_test.go b/checks/cloud/aws/rds/enable_performance_insights_test.go
index 4447bf44..2c0eeb73 100644
--- a/checks/cloud/aws/rds/enable_performance_insights_test.go
+++ b/checks/cloud/aws/rds/enable_performance_insights_test.go
@@ -3,7 +3,7 @@ package rds
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEnablePerformanceInsights(t *testing.T) {
 			input: rds.RDS{
 				Instances: []rds.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PerformanceInsights: rds.PerformanceInsights{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-kms-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-kms-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -41,11 +41,11 @@ func TestCheckEnablePerformanceInsights(t *testing.T) {
 			input: rds.RDS{
 				Instances: []rds.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PerformanceInsights: rds.PerformanceInsights{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-kms-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-kms-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/rds/encrypt_cluster_storage_data_test.go b/checks/cloud/aws/rds/encrypt_cluster_storage_data_test.go
index bb0582b1..60a6329d 100644
--- a/checks/cloud/aws/rds/encrypt_cluster_storage_data_test.go
+++ b/checks/cloud/aws/rds/encrypt_cluster_storage_data_test.go
@@ -3,7 +3,7 @@ package rds
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEncryptClusterStorageData(t *testing.T) {
 			input: rds.RDS{
 				Clusters: []rds.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: rds.Encryption{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							EncryptStorage: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							KMSKeyID:       defsecTypes.String("kms-key", defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							EncryptStorage: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							KMSKeyID:       trivyTypes.String("kms-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckEncryptClusterStorageData(t *testing.T) {
 			input: rds.RDS{
 				Clusters: []rds.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: rds.Encryption{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							EncryptStorage: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyID:       defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							EncryptStorage: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyID:       trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckEncryptClusterStorageData(t *testing.T) {
 			input: rds.RDS{
 				Clusters: []rds.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: rds.Encryption{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							EncryptStorage: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyID:       defsecTypes.String("kms-key", defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							EncryptStorage: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyID:       trivyTypes.String("kms-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/rds/encrypt_instance_storage_data_test.go b/checks/cloud/aws/rds/encrypt_instance_storage_data_test.go
index d0b52803..1693c4f1 100644
--- a/checks/cloud/aws/rds/encrypt_instance_storage_data_test.go
+++ b/checks/cloud/aws/rds/encrypt_instance_storage_data_test.go
@@ -3,7 +3,7 @@ package rds
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEncryptInstanceStorageData(t *testing.T) {
 			input: rds.RDS{
 				Instances: []rds.Instance{
 					{
-						Metadata:             defsecTypes.NewTestMetadata(),
-						ReplicationSourceARN: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:             trivyTypes.NewTestMetadata(),
+						ReplicationSourceARN: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						Encryption: rds.Encryption{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							EncryptStorage: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							EncryptStorage: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckEncryptInstanceStorageData(t *testing.T) {
 			input: rds.RDS{
 				Instances: []rds.Instance{
 					{
-						Metadata:             defsecTypes.NewTestMetadata(),
-						ReplicationSourceARN: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:             trivyTypes.NewTestMetadata(),
+						ReplicationSourceARN: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						Encryption: rds.Encryption{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							EncryptStorage: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							EncryptStorage: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/rds/performance_insights_encryption_customer_key_test.go b/checks/cloud/aws/rds/performance_insights_encryption_customer_key_test.go
index a3d742ec..ae60b152 100644
--- a/checks/cloud/aws/rds/performance_insights_encryption_customer_key_test.go
+++ b/checks/cloud/aws/rds/performance_insights_encryption_customer_key_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -21,11 +21,11 @@ func TestCheckPerformanceInsightsEncryptionCustomerKey(t *testing.T) {
 			input: rds.RDS{
 				Instances: []rds.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PerformanceInsights: rds.PerformanceInsights{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-kms-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-kms-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -37,15 +37,15 @@ func TestCheckPerformanceInsightsEncryptionCustomerKey(t *testing.T) {
 			input: rds.RDS{
 				Clusters: []rds.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Instances: []rds.ClusterInstance{
 							{
 								Instance: rds.Instance{
-									Metadata: defsecTypes.NewTestMetadata(),
+									Metadata: trivyTypes.NewTestMetadata(),
 									PerformanceInsights: rds.PerformanceInsights{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-										KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+										KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -60,11 +60,11 @@ func TestCheckPerformanceInsightsEncryptionCustomerKey(t *testing.T) {
 			input: rds.RDS{
 				Instances: []rds.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PerformanceInsights: rds.PerformanceInsights{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-kms-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-kms-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/rds/specify_backup_retention_test.go b/checks/cloud/aws/rds/specify_backup_retention_test.go
index 38cdaf42..0ea100c7 100644
--- a/checks/cloud/aws/rds/specify_backup_retention_test.go
+++ b/checks/cloud/aws/rds/specify_backup_retention_test.go
@@ -3,7 +3,7 @@ package rds
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckBackupRetentionSpecified(t *testing.T) {
 			input: rds.RDS{
 				Clusters: []rds.Cluster{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						ReplicationSourceARN:      defsecTypes.String("", defsecTypes.NewTestMetadata()),
-						BackupRetentionPeriodDays: defsecTypes.Int(1, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						ReplicationSourceARN:      trivyTypes.String("", trivyTypes.NewTestMetadata()),
+						BackupRetentionPeriodDays: trivyTypes.Int(1, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -37,9 +37,9 @@ func TestCheckBackupRetentionSpecified(t *testing.T) {
 			input: rds.RDS{
 				Instances: []rds.Instance{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						ReplicationSourceARN:      defsecTypes.String("", defsecTypes.NewTestMetadata()),
-						BackupRetentionPeriodDays: defsecTypes.Int(1, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						ReplicationSourceARN:      trivyTypes.String("", trivyTypes.NewTestMetadata()),
+						BackupRetentionPeriodDays: trivyTypes.Int(1, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -50,9 +50,9 @@ func TestCheckBackupRetentionSpecified(t *testing.T) {
 			input: rds.RDS{
 				Clusters: []rds.Cluster{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						ReplicationSourceARN:      defsecTypes.String("", defsecTypes.NewTestMetadata()),
-						BackupRetentionPeriodDays: defsecTypes.Int(5, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						ReplicationSourceARN:      trivyTypes.String("", trivyTypes.NewTestMetadata()),
+						BackupRetentionPeriodDays: trivyTypes.Int(5, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -63,9 +63,9 @@ func TestCheckBackupRetentionSpecified(t *testing.T) {
 			input: rds.RDS{
 				Instances: []rds.Instance{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						ReplicationSourceARN:      defsecTypes.String("", defsecTypes.NewTestMetadata()),
-						BackupRetentionPeriodDays: defsecTypes.Int(5, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						ReplicationSourceARN:      trivyTypes.String("", trivyTypes.NewTestMetadata()),
+						BackupRetentionPeriodDays: trivyTypes.Int(5, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/redshift/add_description_to_security_group_test.go b/checks/cloud/aws/redshift/add_description_to_security_group_test.go
index 68b6a984..9b3e7efb 100644
--- a/checks/cloud/aws/redshift/add_description_to_security_group_test.go
+++ b/checks/cloud/aws/redshift/add_description_to_security_group_test.go
@@ -3,7 +3,7 @@ package redshift
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAddDescriptionToSecurityGroup(t *testing.T) {
 			input: redshift.Redshift{
 				SecurityGroups: []redshift.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAddDescriptionToSecurityGroup(t *testing.T) {
 			input: redshift.Redshift{
 				SecurityGroups: []redshift.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("security group description", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("security group description", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/redshift/encryption_customer_key_test.go b/checks/cloud/aws/redshift/encryption_customer_key_test.go
index da0db754..face7ecb 100644
--- a/checks/cloud/aws/redshift/encryption_customer_key_test.go
+++ b/checks/cloud/aws/redshift/encryption_customer_key_test.go
@@ -3,7 +3,7 @@ package redshift
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: redshift.Redshift{
 				Clusters: []redshift.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: redshift.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: redshift.Redshift{
 				Clusters: []redshift.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: redshift.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: redshift.Redshift{
 				Clusters: []redshift.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: redshift.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyID: defsecTypes.String("some-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyID: trivyTypes.String("some-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/redshift/use_vpc_test.go b/checks/cloud/aws/redshift/use_vpc_test.go
index 1390111c..d7ee896b 100644
--- a/checks/cloud/aws/redshift/use_vpc_test.go
+++ b/checks/cloud/aws/redshift/use_vpc_test.go
@@ -3,7 +3,7 @@ package redshift
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckUsesVPC(t *testing.T) {
 			input: redshift.Redshift{
 				Clusters: []redshift.Cluster{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						SubnetGroupName: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						SubnetGroupName: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckUsesVPC(t *testing.T) {
 			input: redshift.Redshift{
 				Clusters: []redshift.Cluster{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						SubnetGroupName: defsecTypes.String("redshift-subnet", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						SubnetGroupName: trivyTypes.String("redshift-subnet", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/s3/block_public_acls_test.go b/checks/cloud/aws/s3/block_public_acls_test.go
index 46b3d8d4..1519697b 100644
--- a/checks/cloud/aws/s3/block_public_acls_test.go
+++ b/checks/cloud/aws/s3/block_public_acls_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,7 +24,7 @@ func TestCheckPublicACLsAreBlocked(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 					},
 				},
 			},
@@ -35,10 +35,10 @@ func TestCheckPublicACLsAreBlocked(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PublicAccessBlock: &s3.PublicAccessBlock{
-							Metadata:        defsecTypes.NewTestMetadata(),
-							BlockPublicACLs: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:        trivyTypes.NewTestMetadata(),
+							BlockPublicACLs: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/s3/block_public_policy_test.go b/checks/cloud/aws/s3/block_public_policy_test.go
index e43afb4a..3c535a08 100644
--- a/checks/cloud/aws/s3/block_public_policy_test.go
+++ b/checks/cloud/aws/s3/block_public_policy_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,7 +24,7 @@ func TestCheckPublicPoliciesAreBlocked(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 					},
 				},
 			},
@@ -35,10 +35,10 @@ func TestCheckPublicPoliciesAreBlocked(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PublicAccessBlock: &s3.PublicAccessBlock{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							BlockPublicPolicy: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							BlockPublicPolicy: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/s3/enable_bucket_encryption_test.go b/checks/cloud/aws/s3/enable_bucket_encryption_test.go
index 0fa8ce3a..e672d77d 100644
--- a/checks/cloud/aws/s3/enable_bucket_encryption_test.go
+++ b/checks/cloud/aws/s3/enable_bucket_encryption_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEncryptionIsEnabled(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: s3.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEncryptionIsEnabled(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: s3.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/s3/enable_object_read_logging_test.go b/checks/cloud/aws/s3/enable_object_read_logging_test.go
index ec7b9e28..8f974a49 100644
--- a/checks/cloud/aws/s3/enable_object_read_logging_test.go
+++ b/checks/cloud/aws/s3/enable_object_read_logging_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -26,8 +26,8 @@ func TestCheckEnableObjectReadLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -38,25 +38,25 @@ func TestCheckEnableObjectReadLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("WriteOnly", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("WriteOnly", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -72,25 +72,25 @@ func TestCheckEnableObjectReadLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("ReadOnly", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("ReadOnly", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -106,25 +106,25 @@ func TestCheckEnableObjectReadLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("All", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("All", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -140,25 +140,25 @@ func TestCheckEnableObjectReadLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("All", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("All", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3:::test-bucket/", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3:::test-bucket/", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -174,25 +174,25 @@ func TestCheckEnableObjectReadLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("All", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("All", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3:::test-bucket2/", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3:::test-bucket2/", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -208,25 +208,25 @@ func TestCheckEnableObjectReadLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("All", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("All", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3:::test-bucket", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3:::test-bucket", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
diff --git a/checks/cloud/aws/s3/enable_object_write_logging_test.go b/checks/cloud/aws/s3/enable_object_write_logging_test.go
index 2136da6a..34e35613 100644
--- a/checks/cloud/aws/s3/enable_object_write_logging_test.go
+++ b/checks/cloud/aws/s3/enable_object_write_logging_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -26,8 +26,8 @@ func TestCheckEnableObjectWriteLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -38,25 +38,25 @@ func TestCheckEnableObjectWriteLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("ReadOnly", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("ReadOnly", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -72,25 +72,25 @@ func TestCheckEnableObjectWriteLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("WriteOnly", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("WriteOnly", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -106,25 +106,25 @@ func TestCheckEnableObjectWriteLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("All", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("All", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -140,25 +140,25 @@ func TestCheckEnableObjectWriteLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("All", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("All", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3:::test-bucket/", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3:::test-bucket/", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -174,25 +174,25 @@ func TestCheckEnableObjectWriteLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("All", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("All", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3:::test-bucket2/", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3:::test-bucket2/", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
@@ -208,25 +208,25 @@ func TestCheckEnableObjectWriteLogging(t *testing.T) {
 			s3: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Name:     defsecTypes.String("test-bucket", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Name:     trivyTypes.String("test-bucket", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
 			cloudtrail: cloudtrail.CloudTrail{
 				Trails: []cloudtrail.Trail{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						EventSelectors: []cloudtrail.EventSelector{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								ReadWriteType: defsecTypes.String("All", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								ReadWriteType: trivyTypes.String("All", trivyTypes.NewTestMetadata()),
 								DataResources: []cloudtrail.DataResource{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Type:     defsecTypes.String("AWS::S3::Object", defsecTypes.NewTestMetadata()),
-										Values: []defsecTypes.StringValue{
-											defsecTypes.String("arn:aws:s3:::test-bucket", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Type:     trivyTypes.String("AWS::S3::Object", trivyTypes.NewTestMetadata()),
+										Values: []trivyTypes.StringValue{
+											trivyTypes.String("arn:aws:s3:::test-bucket", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
diff --git a/checks/cloud/aws/s3/enable_versioning_test.go b/checks/cloud/aws/s3/enable_versioning_test.go
index 5b03d69f..a1cb6603 100644
--- a/checks/cloud/aws/s3/enable_versioning_test.go
+++ b/checks/cloud/aws/s3/enable_versioning_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckVersioningIsEnabled(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Versioning: s3.Versioning{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckVersioningIsEnabled(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Versioning: s3.Versioning{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/s3/encryption_customer_key_test.go b/checks/cloud/aws/s3/encryption_customer_key_test.go
index 0e0a4267..3f0d8646 100644
--- a/checks/cloud/aws/s3/encryption_customer_key_test.go
+++ b/checks/cloud/aws/s3/encryption_customer_key_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: s3.Encryption{
-							Metadata: defsecTypes.Metadata{},
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyId: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.Metadata{},
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyId: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckEncryptionCustomerKey(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: s3.Encryption{
-							Metadata: defsecTypes.Metadata{},
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyId: defsecTypes.String("some-sort-of-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.Metadata{},
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyId: trivyTypes.String("some-sort-of-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/s3/ignore_public_acls_test.go b/checks/cloud/aws/s3/ignore_public_acls_test.go
index 0b85ffa9..886ba785 100644
--- a/checks/cloud/aws/s3/ignore_public_acls_test.go
+++ b/checks/cloud/aws/s3/ignore_public_acls_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,7 +24,7 @@ func TestCheckPublicACLsAreIgnored(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 					},
 				},
 			},
@@ -35,10 +35,10 @@ func TestCheckPublicACLsAreIgnored(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PublicAccessBlock: &s3.PublicAccessBlock{
-							Metadata:         defsecTypes.NewTestMetadata(),
-							IgnorePublicACLs: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:         trivyTypes.NewTestMetadata(),
+							IgnorePublicACLs: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/s3/no_public_access_with_acl_test.go b/checks/cloud/aws/s3/no_public_access_with_acl_test.go
index c4d0d1c5..a02c8176 100644
--- a/checks/cloud/aws/s3/no_public_access_with_acl_test.go
+++ b/checks/cloud/aws/s3/no_public_access_with_acl_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckForPublicACL(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						ACL:      defsecTypes.String("public-read", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						ACL:      trivyTypes.String("public-read", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckForPublicACL(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						ACL:      defsecTypes.String("private", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						ACL:      trivyTypes.String("private", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/s3/no_public_buckets_test.go b/checks/cloud/aws/s3/no_public_buckets_test.go
index 116bae13..d9a5edb3 100644
--- a/checks/cloud/aws/s3/no_public_buckets_test.go
+++ b/checks/cloud/aws/s3/no_public_buckets_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,7 +24,7 @@ func TestCheckPublicBucketsAreRestricted(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 					},
 				},
 			},
@@ -35,10 +35,10 @@ func TestCheckPublicBucketsAreRestricted(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PublicAccessBlock: &s3.PublicAccessBlock{
-							Metadata:              defsecTypes.NewTestMetadata(),
-							RestrictPublicBuckets: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:              trivyTypes.NewTestMetadata(),
+							RestrictPublicBuckets: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/s3/require_mfa_delete_test.go b/checks/cloud/aws/s3/require_mfa_delete_test.go
index 86f7c2fb..1acb688e 100644
--- a/checks/cloud/aws/s3/require_mfa_delete_test.go
+++ b/checks/cloud/aws/s3/require_mfa_delete_test.go
@@ -3,7 +3,7 @@ package s3
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckRequireMFADelete(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Versioning: s3.Versioning{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							Enabled:   defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							MFADelete: defsecTypes.BoolUnresolvable(defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							Enabled:   trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							MFADelete: trivyTypes.BoolUnresolvable(trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckRequireMFADelete(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Versioning: s3.Versioning{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							Enabled:   defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							MFADelete: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							Enabled:   trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							MFADelete: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckRequireMFADelete(t *testing.T) {
 			input: s3.S3{
 				Buckets: []s3.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Versioning: s3.Versioning{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							Enabled:   defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							MFADelete: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							Enabled:   trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							MFADelete: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sam/api_use_secure_tls_policy_test.go b/checks/cloud/aws/sam/api_use_secure_tls_policy_test.go
index 5c11884e..40553d6a 100644
--- a/checks/cloud/aws/sam/api_use_secure_tls_policy_test.go
+++ b/checks/cloud/aws/sam/api_use_secure_tls_policy_test.go
@@ -3,7 +3,7 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckApiUseSecureTlsPolicy(t *testing.T) {
 			input: sam.SAM{
 				APIs: []sam.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						DomainConfiguration: sam.DomainConfiguration{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							SecurityPolicy: defsecTypes.String("TLS_1_0", defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							SecurityPolicy: trivyTypes.String("TLS_1_0", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckApiUseSecureTlsPolicy(t *testing.T) {
 			input: sam.SAM{
 				APIs: []sam.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						DomainConfiguration: sam.DomainConfiguration{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							SecurityPolicy: defsecTypes.String("TLS_1_2", defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							SecurityPolicy: trivyTypes.String("TLS_1_2", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sam/enable_api_access_logging_test.go b/checks/cloud/aws/sam/enable_api_access_logging_test.go
index 827370c2..16b86db1 100644
--- a/checks/cloud/aws/sam/enable_api_access_logging_test.go
+++ b/checks/cloud/aws/sam/enable_api_access_logging_test.go
@@ -3,7 +3,7 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableApiAccessLogging(t *testing.T) {
 			input: sam.SAM{
 				APIs: []sam.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AccessLogging: sam.AccessLogging{
-							Metadata:              defsecTypes.NewTestMetadata(),
-							CloudwatchLogGroupARN: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:              trivyTypes.NewTestMetadata(),
+							CloudwatchLogGroupARN: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableApiAccessLogging(t *testing.T) {
 			input: sam.SAM{
 				APIs: []sam.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AccessLogging: sam.AccessLogging{
-							Metadata:              defsecTypes.NewTestMetadata(),
-							CloudwatchLogGroupARN: defsecTypes.String("log-group-arn", defsecTypes.NewTestMetadata()),
+							Metadata:              trivyTypes.NewTestMetadata(),
+							CloudwatchLogGroupARN: trivyTypes.String("log-group-arn", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sam/enable_api_cache_encryption_test.go b/checks/cloud/aws/sam/enable_api_cache_encryption_test.go
index 49ee1878..9587ebaf 100644
--- a/checks/cloud/aws/sam/enable_api_cache_encryption_test.go
+++ b/checks/cloud/aws/sam/enable_api_cache_encryption_test.go
@@ -3,7 +3,7 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableApiCacheEncryption(t *testing.T) {
 			input: sam.SAM{
 				APIs: []sam.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RESTMethodSettings: sam.RESTMethodSettings{
-							Metadata:           defsecTypes.NewTestMetadata(),
-							CacheDataEncrypted: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:           trivyTypes.NewTestMetadata(),
+							CacheDataEncrypted: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableApiCacheEncryption(t *testing.T) {
 			input: sam.SAM{
 				APIs: []sam.API{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RESTMethodSettings: sam.RESTMethodSettings{
-							Metadata:           defsecTypes.NewTestMetadata(),
-							CacheDataEncrypted: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:           trivyTypes.NewTestMetadata(),
+							CacheDataEncrypted: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sam/enable_api_tracing_test.go b/checks/cloud/aws/sam/enable_api_tracing_test.go
index bd14476d..39c0ec61 100644
--- a/checks/cloud/aws/sam/enable_api_tracing_test.go
+++ b/checks/cloud/aws/sam/enable_api_tracing_test.go
@@ -3,7 +3,7 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableApiTracing(t *testing.T) {
 			input: sam.SAM{
 				APIs: []sam.API{
 					{
-						Metadata:       defsecTypes.NewTestMetadata(),
-						TracingEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:       trivyTypes.NewTestMetadata(),
+						TracingEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableApiTracing(t *testing.T) {
 			input: sam.SAM{
 				APIs: []sam.API{
 					{
-						Metadata:       defsecTypes.NewTestMetadata(),
-						TracingEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:       trivyTypes.NewTestMetadata(),
+						TracingEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/sam/enable_function_tracing_test.go b/checks/cloud/aws/sam/enable_function_tracing_test.go
index d5dba6ed..b43023f5 100644
--- a/checks/cloud/aws/sam/enable_function_tracing_test.go
+++ b/checks/cloud/aws/sam/enable_function_tracing_test.go
@@ -3,7 +3,7 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableFunctionTracing(t *testing.T) {
 			input: sam.SAM{
 				Functions: []sam.Function{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Tracing:  defsecTypes.String(sam.TracingModePassThrough, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Tracing:  trivyTypes.String(sam.TracingModePassThrough, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableFunctionTracing(t *testing.T) {
 			input: sam.SAM{
 				Functions: []sam.Function{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Tracing:  defsecTypes.String(sam.TracingModeActive, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Tracing:  trivyTypes.String(sam.TracingModeActive, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/sam/enable_http_api_access_logging_test.go b/checks/cloud/aws/sam/enable_http_api_access_logging_test.go
index 04010459..5f38a84c 100644
--- a/checks/cloud/aws/sam/enable_http_api_access_logging_test.go
+++ b/checks/cloud/aws/sam/enable_http_api_access_logging_test.go
@@ -3,7 +3,7 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableHttpApiAccessLogging(t *testing.T) {
 			input: sam.SAM{
 				HttpAPIs: []sam.HttpAPI{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AccessLogging: sam.AccessLogging{
-							Metadata:              defsecTypes.NewTestMetadata(),
-							CloudwatchLogGroupARN: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:              trivyTypes.NewTestMetadata(),
+							CloudwatchLogGroupARN: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableHttpApiAccessLogging(t *testing.T) {
 			input: sam.SAM{
 				HttpAPIs: []sam.HttpAPI{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AccessLogging: sam.AccessLogging{
-							Metadata:              defsecTypes.NewTestMetadata(),
-							CloudwatchLogGroupARN: defsecTypes.String("log-group-arn", defsecTypes.NewTestMetadata()),
+							Metadata:              trivyTypes.NewTestMetadata(),
+							CloudwatchLogGroupARN: trivyTypes.String("log-group-arn", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sam/enable_state_machine_logging_test.go b/checks/cloud/aws/sam/enable_state_machine_logging_test.go
index d9591076..a77b94d1 100644
--- a/checks/cloud/aws/sam/enable_state_machine_logging_test.go
+++ b/checks/cloud/aws/sam/enable_state_machine_logging_test.go
@@ -3,7 +3,7 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableStateMachineLogging(t *testing.T) {
 			input: sam.SAM{
 				StateMachines: []sam.StateMachine{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						LoggingConfiguration: sam.LoggingConfiguration{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							LoggingEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							LoggingEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableStateMachineLogging(t *testing.T) {
 			input: sam.SAM{
 				StateMachines: []sam.StateMachine{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						LoggingConfiguration: sam.LoggingConfiguration{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							LoggingEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							LoggingEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sam/enable_state_machine_tracing_test.go b/checks/cloud/aws/sam/enable_state_machine_tracing_test.go
index 5b1a91c3..10e3935b 100644
--- a/checks/cloud/aws/sam/enable_state_machine_tracing_test.go
+++ b/checks/cloud/aws/sam/enable_state_machine_tracing_test.go
@@ -3,7 +3,7 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableStateMachineTracing(t *testing.T) {
 			input: sam.SAM{
 				StateMachines: []sam.StateMachine{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Tracing: sam.TracingConfiguration{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableStateMachineTracing(t *testing.T) {
 			input: sam.SAM{
 				StateMachines: []sam.StateMachine{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Tracing: sam.TracingConfiguration{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sam/enable_table_encryption_test.go b/checks/cloud/aws/sam/enable_table_encryption_test.go
index b070b705..e16e6548 100644
--- a/checks/cloud/aws/sam/enable_table_encryption_test.go
+++ b/checks/cloud/aws/sam/enable_table_encryption_test.go
@@ -3,7 +3,7 @@ package sam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableTableEncryption(t *testing.T) {
 			input: sam.SAM{
 				SimpleTables: []sam.SimpleTable{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						SSESpecification: sam.SSESpecification{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableTableEncryption(t *testing.T) {
 			input: sam.SAM{
 				SimpleTables: []sam.SimpleTable{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						SSESpecification: sam.SSESpecification{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sns/enable_topic_encryption_test.go b/checks/cloud/aws/sns/enable_topic_encryption_test.go
index bd064d4a..1fea94da 100644
--- a/checks/cloud/aws/sns/enable_topic_encryption_test.go
+++ b/checks/cloud/aws/sns/enable_topic_encryption_test.go
@@ -3,7 +3,7 @@ package sns
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableTopicEncryption(t *testing.T) {
 			input: sns.SNS{
 				Topics: []sns.Topic{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sns.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableTopicEncryption(t *testing.T) {
 			input: sns.SNS{
 				Topics: []sns.Topic{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sns.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("alias/aws/sns", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("alias/aws/sns", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -54,10 +54,10 @@ func TestCheckEnableTopicEncryption(t *testing.T) {
 			input: sns.SNS{
 				Topics: []sns.Topic{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sns.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("some-ok-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("some-ok-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sns/topic_encryption_with_cmk_test.go b/checks/cloud/aws/sns/topic_encryption_with_cmk_test.go
index 15abd7d8..86fd0771 100644
--- a/checks/cloud/aws/sns/topic_encryption_with_cmk_test.go
+++ b/checks/cloud/aws/sns/topic_encryption_with_cmk_test.go
@@ -3,7 +3,7 @@ package sns
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckTopicEncryptionUsesCMK(t *testing.T) {
 			input: sns.SNS{
 				Topics: []sns.Topic{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sns.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckTopicEncryptionUsesCMK(t *testing.T) {
 			input: sns.SNS{
 				Topics: []sns.Topic{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sns.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("alias/aws/sns", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("alias/aws/sns", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -54,10 +54,10 @@ func TestCheckTopicEncryptionUsesCMK(t *testing.T) {
 			input: sns.SNS{
 				Topics: []sns.Topic{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sns.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("some-ok-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("some-ok-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sqs/enable_queue_encryption_test.go b/checks/cloud/aws/sqs/enable_queue_encryption_test.go
index a749926d..4d086407 100644
--- a/checks/cloud/aws/sqs/enable_queue_encryption_test.go
+++ b/checks/cloud/aws/sqs/enable_queue_encryption_test.go
@@ -3,7 +3,7 @@ package sqs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEnableQueueEncryption(t *testing.T) {
 			input: sqs.SQS{
 				Queues: []sqs.Queue{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sqs.Encryption{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							ManagedEncryption: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							KMSKeyID:          defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							ManagedEncryption: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							KMSKeyID:          trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckEnableQueueEncryption(t *testing.T) {
 			input: sqs.SQS{
 				Queues: []sqs.Queue{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sqs.Encryption{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							ManagedEncryption: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							KMSKeyID:          defsecTypes.String("alias/aws/sqs", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							ManagedEncryption: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							KMSKeyID:          trivyTypes.String("alias/aws/sqs", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckEnableQueueEncryption(t *testing.T) {
 			input: sqs.SQS{
 				Queues: []sqs.Queue{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sqs.Encryption{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							ManagedEncryption: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							KMSKeyID:          defsecTypes.String("some-ok-key", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							ManagedEncryption: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							KMSKeyID:          trivyTypes.String("some-ok-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -72,11 +72,11 @@ func TestCheckEnableQueueEncryption(t *testing.T) {
 			input: sqs.SQS{
 				Queues: []sqs.Queue{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sqs.Encryption{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							ManagedEncryption: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							KMSKeyID:          defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							ManagedEncryption: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							KMSKeyID:          trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/sqs/queue_encryption_with_cmk_test.go b/checks/cloud/aws/sqs/queue_encryption_with_cmk_test.go
index 4c82119c..23f7670c 100644
--- a/checks/cloud/aws/sqs/queue_encryption_with_cmk_test.go
+++ b/checks/cloud/aws/sqs/queue_encryption_with_cmk_test.go
@@ -3,7 +3,7 @@ package sqs
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckQueueEncryptionUsesCMK(t *testing.T) {
 			input: sqs.SQS{
 				Queues: []sqs.Queue{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sqs.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckQueueEncryptionUsesCMK(t *testing.T) {
 			input: sqs.SQS{
 				Queues: []sqs.Queue{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sqs.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("alias/aws/sqs", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("alias/aws/sqs", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -54,10 +54,10 @@ func TestCheckQueueEncryptionUsesCMK(t *testing.T) {
 			input: sqs.SQS{
 				Queues: []sqs.Queue{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: sqs.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							KMSKeyID: defsecTypes.String("some-ok-key", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							KMSKeyID: trivyTypes.String("some-ok-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/aws/ssm/secret_use_customer_key_test.go b/checks/cloud/aws/ssm/secret_use_customer_key_test.go
index add2e4a6..c73830cb 100644
--- a/checks/cloud/aws/ssm/secret_use_customer_key_test.go
+++ b/checks/cloud/aws/ssm/secret_use_customer_key_test.go
@@ -3,7 +3,7 @@ package ssm
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckSecretUseCustomerKey(t *testing.T) {
 			input: ssm.SSM{
 				Secrets: []ssm.Secret{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckSecretUseCustomerKey(t *testing.T) {
 			input: ssm.SSM{
 				Secrets: []ssm.Secret{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String(ssm.DefaultKMSKeyID, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String(ssm.DefaultKMSKeyID, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -48,8 +48,8 @@ func TestCheckSecretUseCustomerKey(t *testing.T) {
 			input: ssm.SSM{
 				Secrets: []ssm.Secret{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						KMSKeyID: defsecTypes.String("some-ok-key", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						KMSKeyID: trivyTypes.String("some-ok-key", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/aws/workspaces/enable_disk_encryption_test.go b/checks/cloud/aws/workspaces/enable_disk_encryption_test.go
index 41f7cce5..fe43bdb8 100644
--- a/checks/cloud/aws/workspaces/enable_disk_encryption_test.go
+++ b/checks/cloud/aws/workspaces/enable_disk_encryption_test.go
@@ -3,7 +3,7 @@ package workspaces
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,19 +24,19 @@ func TestCheckEnableDiskEncryption(t *testing.T) {
 			input: workspaces.WorkSpaces{
 				WorkSpaces: []workspaces.WorkSpace{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RootVolume: workspaces.Volume{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Encryption: workspaces.Encryption{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 						UserVolume: workspaces.Volume{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Encryption: workspaces.Encryption{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -49,19 +49,19 @@ func TestCheckEnableDiskEncryption(t *testing.T) {
 			input: workspaces.WorkSpaces{
 				WorkSpaces: []workspaces.WorkSpace{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RootVolume: workspaces.Volume{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Encryption: workspaces.Encryption{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 						UserVolume: workspaces.Volume{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Encryption: workspaces.Encryption{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -75,19 +75,19 @@ func TestCheckEnableDiskEncryption(t *testing.T) {
 			input: workspaces.WorkSpaces{
 				WorkSpaces: []workspaces.WorkSpace{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RootVolume: workspaces.Volume{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Encryption: workspaces.Encryption{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 						UserVolume: workspaces.Volume{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Encryption: workspaces.Encryption{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/appservice/account_identity_registered_test.go b/checks/cloud/azure/appservice/account_identity_registered_test.go
index a3797921..be2f316b 100644
--- a/checks/cloud/azure/appservice/account_identity_registered_test.go
+++ b/checks/cloud/azure/appservice/account_identity_registered_test.go
@@ -3,7 +3,7 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckAccountIdentityRegistered(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Identity: struct{ Type defsecTypes.StringValue }{
-							Type: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Identity: struct{ Type trivyTypes.StringValue }{
+							Type: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -38,9 +38,9 @@ func TestCheckAccountIdentityRegistered(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Identity: struct{ Type defsecTypes.StringValue }{
-							Type: defsecTypes.String("UserAssigned", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Identity: struct{ Type trivyTypes.StringValue }{
+							Type: trivyTypes.String("UserAssigned", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/appservice/authentication_enabled_test.go b/checks/cloud/azure/appservice/authentication_enabled_test.go
index 6da9264d..67d6abac 100644
--- a/checks/cloud/azure/appservice/authentication_enabled_test.go
+++ b/checks/cloud/azure/appservice/authentication_enabled_test.go
@@ -3,7 +3,7 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckAuthenticationEnabled(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Authentication: struct{ Enabled defsecTypes.BoolValue }{
-							Enabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Authentication: struct{ Enabled trivyTypes.BoolValue }{
+							Enabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -38,9 +38,9 @@ func TestCheckAuthenticationEnabled(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Authentication: struct{ Enabled defsecTypes.BoolValue }{
-							Enabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Authentication: struct{ Enabled trivyTypes.BoolValue }{
+							Enabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/appservice/enable_http2_test.go b/checks/cloud/azure/appservice/enable_http2_test.go
index ca55660b..da78ab2b 100644
--- a/checks/cloud/azure/appservice/enable_http2_test.go
+++ b/checks/cloud/azure/appservice/enable_http2_test.go
@@ -3,7 +3,7 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckEnableHttp2(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Site: struct {
-							EnableHTTP2       defsecTypes.BoolValue
-							MinimumTLSVersion defsecTypes.StringValue
+							EnableHTTP2       trivyTypes.BoolValue
+							MinimumTLSVersion trivyTypes.StringValue
 						}{
-							EnableHTTP2: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							EnableHTTP2: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -41,12 +41,12 @@ func TestCheckEnableHttp2(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Site: struct {
-							EnableHTTP2       defsecTypes.BoolValue
-							MinimumTLSVersion defsecTypes.StringValue
+							EnableHTTP2       trivyTypes.BoolValue
+							MinimumTLSVersion trivyTypes.StringValue
 						}{
-							EnableHTTP2: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							EnableHTTP2: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/appservice/enforce_https_test.go b/checks/cloud/azure/appservice/enforce_https_test.go
index 1e489a92..ae2194c1 100644
--- a/checks/cloud/azure/appservice/enforce_https_test.go
+++ b/checks/cloud/azure/appservice/enforce_https_test.go
@@ -3,7 +3,7 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: appservice.AppService{
 				FunctionApps: []appservice.FunctionApp{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						HTTPSOnly: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						HTTPSOnly: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: appservice.AppService{
 				FunctionApps: []appservice.FunctionApp{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						HTTPSOnly: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						HTTPSOnly: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/appservice/require_client_cert_test.go b/checks/cloud/azure/appservice/require_client_cert_test.go
index f925c2c9..8734f50b 100644
--- a/checks/cloud/azure/appservice/require_client_cert_test.go
+++ b/checks/cloud/azure/appservice/require_client_cert_test.go
@@ -3,7 +3,7 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckRequireClientCert(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						EnableClientCert: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						EnableClientCert: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckRequireClientCert(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						EnableClientCert: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						EnableClientCert: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/appservice/use_secure_tls_policy_test.go b/checks/cloud/azure/appservice/use_secure_tls_policy_test.go
index 5d457f08..75a1b2ed 100644
--- a/checks/cloud/azure/appservice/use_secure_tls_policy_test.go
+++ b/checks/cloud/azure/appservice/use_secure_tls_policy_test.go
@@ -3,7 +3,7 @@ package appservice
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Site: struct {
-							EnableHTTP2       defsecTypes.BoolValue
-							MinimumTLSVersion defsecTypes.StringValue
+							EnableHTTP2       trivyTypes.BoolValue
+							MinimumTLSVersion trivyTypes.StringValue
 						}{
-							EnableHTTP2:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							MinimumTLSVersion: defsecTypes.String("1.0", defsecTypes.NewTestMetadata()),
+							EnableHTTP2:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							MinimumTLSVersion: trivyTypes.String("1.0", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -42,13 +42,13 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: appservice.AppService{
 				Services: []appservice.Service{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Site: struct {
-							EnableHTTP2       defsecTypes.BoolValue
-							MinimumTLSVersion defsecTypes.StringValue
+							EnableHTTP2       trivyTypes.BoolValue
+							MinimumTLSVersion trivyTypes.StringValue
 						}{
-							EnableHTTP2:       defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							MinimumTLSVersion: defsecTypes.String("1.2", defsecTypes.NewTestMetadata()),
+							EnableHTTP2:       trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							MinimumTLSVersion: trivyTypes.String("1.2", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/authorization/limit_role_actions_test.go b/checks/cloud/azure/authorization/limit_role_actions_test.go
index 4e6251f1..15f93b88 100644
--- a/checks/cloud/azure/authorization/limit_role_actions_test.go
+++ b/checks/cloud/azure/authorization/limit_role_actions_test.go
@@ -3,7 +3,7 @@ package authorization
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,17 +24,17 @@ func TestCheckLimitRoleActions(t *testing.T) {
 			input: authorization.Authorization{
 				RoleDefinitions: []authorization.RoleDefinition{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Permissions: []authorization.Permission{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Actions: []defsecTypes.StringValue{
-									defsecTypes.String("*", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Actions: []trivyTypes.StringValue{
+									trivyTypes.String("*", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
-						AssignableScopes: []defsecTypes.StringValue{
-							defsecTypes.String("/", defsecTypes.NewTestMetadata()),
+						AssignableScopes: []trivyTypes.StringValue{
+							trivyTypes.String("/", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -46,17 +46,17 @@ func TestCheckLimitRoleActions(t *testing.T) {
 			input: authorization.Authorization{
 				RoleDefinitions: []authorization.RoleDefinition{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Permissions: []authorization.Permission{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Actions: []defsecTypes.StringValue{
-									defsecTypes.String("*", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Actions: []trivyTypes.StringValue{
+									trivyTypes.String("*", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
-						AssignableScopes: []defsecTypes.StringValue{
-							defsecTypes.String("proper-scope", defsecTypes.NewTestMetadata()),
+						AssignableScopes: []trivyTypes.StringValue{
+							trivyTypes.String("proper-scope", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/compute/disable_password_authentication_test.go b/checks/cloud/azure/compute/disable_password_authentication_test.go
index 0a9d9581..6b0ee58e 100644
--- a/checks/cloud/azure/compute/disable_password_authentication_test.go
+++ b/checks/cloud/azure/compute/disable_password_authentication_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckDisablePasswordAuthentication(t *testing.T) {
 			input: compute.Compute{
 				LinuxVirtualMachines: []compute.LinuxVirtualMachine{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						OSProfileLinuxConfig: compute.OSProfileLinuxConfig{
-							Metadata:                      defsecTypes.NewTestMetadata(),
-							DisablePasswordAuthentication: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:                      trivyTypes.NewTestMetadata(),
+							DisablePasswordAuthentication: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckDisablePasswordAuthentication(t *testing.T) {
 			input: compute.Compute{
 				LinuxVirtualMachines: []compute.LinuxVirtualMachine{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						OSProfileLinuxConfig: compute.OSProfileLinuxConfig{
-							Metadata:                      defsecTypes.NewTestMetadata(),
-							DisablePasswordAuthentication: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:                      trivyTypes.NewTestMetadata(),
+							DisablePasswordAuthentication: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/compute/enable_disk_encryption_test.go b/checks/cloud/azure/compute/enable_disk_encryption_test.go
index 8152f642..0ce84fdb 100644
--- a/checks/cloud/azure/compute/enable_disk_encryption_test.go
+++ b/checks/cloud/azure/compute/enable_disk_encryption_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableDiskEncryption(t *testing.T) {
 			input: compute.Compute{
 				ManagedDisks: []compute.ManagedDisk{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: compute.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableDiskEncryption(t *testing.T) {
 			input: compute.Compute{
 				ManagedDisks: []compute.ManagedDisk{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: compute.Encryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/compute/no_secrets_in_custom_data_test.go b/checks/cloud/azure/compute/no_secrets_in_custom_data_test.go
index 90c8c4ec..3af093e3 100644
--- a/checks/cloud/azure/compute/no_secrets_in_custom_data_test.go
+++ b/checks/cloud/azure/compute/no_secrets_in_custom_data_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckNoSecretsInCustomData(t *testing.T) {
 			input: compute.Compute{
 				LinuxVirtualMachines: []compute.LinuxVirtualMachine{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						VirtualMachine: compute.VirtualMachine{
-							Metadata:   defsecTypes.NewTestMetadata(),
-							CustomData: defsecTypes.String(`export DATABASE_PASSWORD=\"SomeSortOfPassword\"`, defsecTypes.NewTestMetadata()),
+							Metadata:   trivyTypes.NewTestMetadata(),
+							CustomData: trivyTypes.String(`export DATABASE_PASSWORD=\"SomeSortOfPassword\"`, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckNoSecretsInCustomData(t *testing.T) {
 			input: compute.Compute{
 				LinuxVirtualMachines: []compute.LinuxVirtualMachine{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						VirtualMachine: compute.VirtualMachine{
-							Metadata:   defsecTypes.NewTestMetadata(),
-							CustomData: defsecTypes.String(`export GREETING="Hello there"`, defsecTypes.NewTestMetadata()),
+							Metadata:   trivyTypes.NewTestMetadata(),
+							CustomData: trivyTypes.String(`export GREETING="Hello there"`, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/container/configured_network_policy_test.go b/checks/cloud/azure/container/configured_network_policy_test.go
index ad117c33..f68953dd 100644
--- a/checks/cloud/azure/container/configured_network_policy_test.go
+++ b/checks/cloud/azure/container/configured_network_policy_test.go
@@ -3,7 +3,7 @@ package container
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckConfiguredNetworkPolicy(t *testing.T) {
 			input: container.Container{
 				KubernetesClusters: []container.KubernetesCluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkProfile: container.NetworkProfile{
-							Metadata:      defsecTypes.NewTestMetadata(),
-							NetworkPolicy: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:      trivyTypes.NewTestMetadata(),
+							NetworkPolicy: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckConfiguredNetworkPolicy(t *testing.T) {
 			input: container.Container{
 				KubernetesClusters: []container.KubernetesCluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkProfile: container.NetworkProfile{
-							Metadata:      defsecTypes.NewTestMetadata(),
-							NetworkPolicy: defsecTypes.String("calico", defsecTypes.NewTestMetadata()),
+							Metadata:      trivyTypes.NewTestMetadata(),
+							NetworkPolicy: trivyTypes.String("calico", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/container/limit_authorized_ips_test.go b/checks/cloud/azure/container/limit_authorized_ips_test.go
index 9b5c0867..8c9dfebf 100644
--- a/checks/cloud/azure/container/limit_authorized_ips_test.go
+++ b/checks/cloud/azure/container/limit_authorized_ips_test.go
@@ -3,7 +3,7 @@ package container
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckLimitAuthorizedIps(t *testing.T) {
 			input: container.Container{
 				KubernetesClusters: []container.KubernetesCluster{
 					{
-						Metadata:                    defsecTypes.NewTestMetadata(),
-						EnablePrivateCluster:        defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-						APIServerAuthorizedIPRanges: []defsecTypes.StringValue{},
+						Metadata:                    trivyTypes.NewTestMetadata(),
+						EnablePrivateCluster:        trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+						APIServerAuthorizedIPRanges: []trivyTypes.StringValue{},
 					},
 				},
 			},
@@ -37,10 +37,10 @@ func TestCheckLimitAuthorizedIps(t *testing.T) {
 			input: container.Container{
 				KubernetesClusters: []container.KubernetesCluster{
 					{
-						Metadata:             defsecTypes.NewTestMetadata(),
-						EnablePrivateCluster: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-						APIServerAuthorizedIPRanges: []defsecTypes.StringValue{
-							defsecTypes.String("1.2.3.4/32", defsecTypes.NewTestMetadata()),
+						Metadata:             trivyTypes.NewTestMetadata(),
+						EnablePrivateCluster: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+						APIServerAuthorizedIPRanges: []trivyTypes.StringValue{
+							trivyTypes.String("1.2.3.4/32", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/container/logging_test.go b/checks/cloud/azure/container/logging_test.go
index 0a477a7d..e1a17ccf 100644
--- a/checks/cloud/azure/container/logging_test.go
+++ b/checks/cloud/azure/container/logging_test.go
@@ -3,7 +3,7 @@ package container
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckLogging(t *testing.T) {
 			input: container.Container{
 				KubernetesClusters: []container.KubernetesCluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AddonProfile: container.AddonProfile{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							OMSAgent: container.OMSAgent{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,12 +42,12 @@ func TestCheckLogging(t *testing.T) {
 			input: container.Container{
 				KubernetesClusters: []container.KubernetesCluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AddonProfile: container.AddonProfile{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							OMSAgent: container.OMSAgent{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/container/use_rbac_permissions_test.go b/checks/cloud/azure/container/use_rbac_permissions_test.go
index bcf0b83d..166c9517 100644
--- a/checks/cloud/azure/container/use_rbac_permissions_test.go
+++ b/checks/cloud/azure/container/use_rbac_permissions_test.go
@@ -3,7 +3,7 @@ package container
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckUseRbacPermissions(t *testing.T) {
 			input: container.Container{
 				KubernetesClusters: []container.KubernetesCluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RoleBasedAccessControl: container.RoleBasedAccessControl{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckUseRbacPermissions(t *testing.T) {
 			input: container.Container{
 				KubernetesClusters: []container.KubernetesCluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RoleBasedAccessControl: container.RoleBasedAccessControl{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/database/all_threat_alerts_enabled_test.go b/checks/cloud/azure/database/all_threat_alerts_enabled_test.go
index 68622e7f..9f35b5dd 100644
--- a/checks/cloud/azure/database/all_threat_alerts_enabled_test.go
+++ b/checks/cloud/azure/database/all_threat_alerts_enabled_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckAllThreatAlertsEnabled(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						SecurityAlertPolicies: []database.SecurityAlertPolicy{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								DisabledAlerts: []defsecTypes.StringValue{
-									defsecTypes.String("Sql_Injection", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								DisabledAlerts: []trivyTypes.StringValue{
+									trivyTypes.String("Sql_Injection", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -43,11 +43,11 @@ func TestCheckAllThreatAlertsEnabled(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						SecurityAlertPolicies: []database.SecurityAlertPolicy{
 							{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								DisabledAlerts: []defsecTypes.StringValue{},
+								Metadata:       trivyTypes.NewTestMetadata(),
+								DisabledAlerts: []trivyTypes.StringValue{},
 							},
 						},
 					},
diff --git a/checks/cloud/azure/database/enable_audit_test.go b/checks/cloud/azure/database/enable_audit_test.go
index 6848f90d..3a588d37 100644
--- a/checks/cloud/azure/database/enable_audit_test.go
+++ b/checks/cloud/azure/database/enable_audit_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,7 +24,7 @@ func TestCheckEnableAudit(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata:                 defsecTypes.NewTestMetadata(),
+						Metadata:                 trivyTypes.NewTestMetadata(),
 						ExtendedAuditingPolicies: []database.ExtendedAuditingPolicy{},
 					},
 				},
@@ -36,11 +36,11 @@ func TestCheckEnableAudit(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ExtendedAuditingPolicies: []database.ExtendedAuditingPolicy{
 							{
-								Metadata:        defsecTypes.NewTestMetadata(),
-								RetentionInDays: defsecTypes.Int(6, defsecTypes.NewTestMetadata()),
+								Metadata:        trivyTypes.NewTestMetadata(),
+								RetentionInDays: trivyTypes.Int(6, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/database/enable_ssl_enforcement_test.go b/checks/cloud/azure/database/enable_ssl_enforcement_test.go
index fc62a661..98adef06 100644
--- a/checks/cloud/azure/database/enable_ssl_enforcement_test.go
+++ b/checks/cloud/azure/database/enable_ssl_enforcement_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableSslEnforcement(t *testing.T) {
 			input: database.Database{
 				MariaDBServers: []database.MariaDBServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							EnableSSLEnforcement: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							EnableSSLEnforcement: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableSslEnforcement(t *testing.T) {
 			input: database.Database{
 				MySQLServers: []database.MySQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							EnableSSLEnforcement: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							EnableSSLEnforcement: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -54,10 +54,10 @@ func TestCheckEnableSslEnforcement(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							EnableSSLEnforcement: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							EnableSSLEnforcement: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -69,10 +69,10 @@ func TestCheckEnableSslEnforcement(t *testing.T) {
 			input: database.Database{
 				MariaDBServers: []database.MariaDBServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							EnableSSLEnforcement: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							EnableSSLEnforcement: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -84,10 +84,10 @@ func TestCheckEnableSslEnforcement(t *testing.T) {
 			input: database.Database{
 				MySQLServers: []database.MySQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							EnableSSLEnforcement: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							EnableSSLEnforcement: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -99,10 +99,10 @@ func TestCheckEnableSslEnforcement(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							EnableSSLEnforcement: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							EnableSSLEnforcement: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/database/no_public_access_test.go b/checks/cloud/azure/database/no_public_access_test.go
index 188d85b1..2f1cffb1 100644
--- a/checks/cloud/azure/database/no_public_access_test.go
+++ b/checks/cloud/azure/database/no_public_access_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: database.Database{
 				MySQLServers: []database.MySQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:                  defsecTypes.NewTestMetadata(),
-							EnablePublicNetworkAccess: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:                  trivyTypes.NewTestMetadata(),
+							EnablePublicNetworkAccess: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: database.Database{
 				MariaDBServers: []database.MariaDBServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:                  defsecTypes.NewTestMetadata(),
-							EnablePublicNetworkAccess: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:                  trivyTypes.NewTestMetadata(),
+							EnablePublicNetworkAccess: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -54,10 +54,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:                  defsecTypes.NewTestMetadata(),
-							EnablePublicNetworkAccess: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:                  trivyTypes.NewTestMetadata(),
+							EnablePublicNetworkAccess: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -69,10 +69,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:                  defsecTypes.NewTestMetadata(),
-							EnablePublicNetworkAccess: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:                  trivyTypes.NewTestMetadata(),
+							EnablePublicNetworkAccess: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -84,10 +84,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: database.Database{
 				MySQLServers: []database.MySQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:                  defsecTypes.NewTestMetadata(),
-							EnablePublicNetworkAccess: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:                  trivyTypes.NewTestMetadata(),
+							EnablePublicNetworkAccess: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -99,10 +99,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: database.Database{
 				MariaDBServers: []database.MariaDBServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:                  defsecTypes.NewTestMetadata(),
-							EnablePublicNetworkAccess: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:                  trivyTypes.NewTestMetadata(),
+							EnablePublicNetworkAccess: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -114,10 +114,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:                  defsecTypes.NewTestMetadata(),
-							EnablePublicNetworkAccess: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:                  trivyTypes.NewTestMetadata(),
+							EnablePublicNetworkAccess: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -129,10 +129,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:                  defsecTypes.NewTestMetadata(),
-							EnablePublicNetworkAccess: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:                  trivyTypes.NewTestMetadata(),
+							EnablePublicNetworkAccess: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/database/no_public_firewall_access_test.go b/checks/cloud/azure/database/no_public_firewall_access_test.go
index 5e27b571..8b419d6c 100644
--- a/checks/cloud/azure/database/no_public_firewall_access_test.go
+++ b/checks/cloud/azure/database/no_public_firewall_access_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,14 +24,14 @@ func TestCheckNoPublicFirewallAccess(t *testing.T) {
 			input: database.Database{
 				MySQLServers: []database.MySQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							FirewallRules: []database.FirewallRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
-									StartIP:  defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
-									EndIP:    defsecTypes.String("255.255.255.255", defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									StartIP:  trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
+									EndIP:    trivyTypes.String("255.255.255.255", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -45,14 +45,14 @@ func TestCheckNoPublicFirewallAccess(t *testing.T) {
 			input: database.Database{
 				MySQLServers: []database.MySQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							FirewallRules: []database.FirewallRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
-									StartIP:  defsecTypes.String("8.8.8.8", defsecTypes.NewTestMetadata()),
-									EndIP:    defsecTypes.String("8.8.8.8", defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									StartIP:  trivyTypes.String("8.8.8.8", trivyTypes.NewTestMetadata()),
+									EndIP:    trivyTypes.String("8.8.8.8", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -66,14 +66,14 @@ func TestCheckNoPublicFirewallAccess(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							FirewallRules: []database.FirewallRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
-									StartIP:  defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
-									EndIP:    defsecTypes.String("255.255.255.255", defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									StartIP:  trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
+									EndIP:    trivyTypes.String("255.255.255.255", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -87,14 +87,14 @@ func TestCheckNoPublicFirewallAccess(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							FirewallRules: []database.FirewallRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
-									StartIP:  defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
-									EndIP:    defsecTypes.String("255.255.255.255", defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									StartIP:  trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
+									EndIP:    trivyTypes.String("255.255.255.255", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -108,14 +108,14 @@ func TestCheckNoPublicFirewallAccess(t *testing.T) {
 			input: database.Database{
 				MariaDBServers: []database.MariaDBServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							FirewallRules: []database.FirewallRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
-									StartIP:  defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
-									EndIP:    defsecTypes.String("255.255.255.255", defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									StartIP:  trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
+									EndIP:    trivyTypes.String("255.255.255.255", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -129,14 +129,14 @@ func TestCheckNoPublicFirewallAccess(t *testing.T) {
 			input: database.Database{
 				MySQLServers: []database.MySQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							FirewallRules: []database.FirewallRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
-									StartIP:  defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
-									EndIP:    defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									StartIP:  trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
+									EndIP:    trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -150,14 +150,14 @@ func TestCheckNoPublicFirewallAccess(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							FirewallRules: []database.FirewallRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
-									StartIP:  defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
-									EndIP:    defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									StartIP:  trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
+									EndIP:    trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -171,14 +171,14 @@ func TestCheckNoPublicFirewallAccess(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							FirewallRules: []database.FirewallRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
-									StartIP:  defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
-									EndIP:    defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									StartIP:  trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
+									EndIP:    trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -192,14 +192,14 @@ func TestCheckNoPublicFirewallAccess(t *testing.T) {
 			input: database.Database{
 				MariaDBServers: []database.MariaDBServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							FirewallRules: []database.FirewallRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
-									StartIP:  defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
-									EndIP:    defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									StartIP:  trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
+									EndIP:    trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/azure/database/postgres_configuration_connection_throttling_test.go b/checks/cloud/azure/database/postgres_configuration_connection_throttling_test.go
index 0d3755f8..38978691 100644
--- a/checks/cloud/azure/database/postgres_configuration_connection_throttling_test.go
+++ b/checks/cloud/azure/database/postgres_configuration_connection_throttling_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckPostgresConfigurationLogConnectionThrottling(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Config: database.PostgresSQLConfig{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							ConnectionThrottling: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							ConnectionThrottling: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckPostgresConfigurationLogConnectionThrottling(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Config: database.PostgresSQLConfig{
-							Metadata:             defsecTypes.NewTestMetadata(),
-							ConnectionThrottling: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:             trivyTypes.NewTestMetadata(),
+							ConnectionThrottling: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/database/postgres_configuration_log_checkpoints_test.go b/checks/cloud/azure/database/postgres_configuration_log_checkpoints_test.go
index f1ab7cfd..467a8f30 100644
--- a/checks/cloud/azure/database/postgres_configuration_log_checkpoints_test.go
+++ b/checks/cloud/azure/database/postgres_configuration_log_checkpoints_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckPostgresConfigurationLogCheckpoints(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Config: database.PostgresSQLConfig{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							LogCheckpoints: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							LogCheckpoints: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckPostgresConfigurationLogCheckpoints(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Config: database.PostgresSQLConfig{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							LogCheckpoints: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							LogCheckpoints: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/database/postgres_configuration_log_connections_test.go b/checks/cloud/azure/database/postgres_configuration_log_connections_test.go
index 0b2ed105..d2df1fbb 100644
--- a/checks/cloud/azure/database/postgres_configuration_log_connections_test.go
+++ b/checks/cloud/azure/database/postgres_configuration_log_connections_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckPostgresConfigurationLogConnections(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Config: database.PostgresSQLConfig{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							LogConnections: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							LogConnections: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckPostgresConfigurationLogConnections(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Config: database.PostgresSQLConfig{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							LogConnections: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							LogConnections: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/database/retention_period_set_test.go b/checks/cloud/azure/database/retention_period_set_test.go
index d9ef3c04..079cc8f1 100644
--- a/checks/cloud/azure/database/retention_period_set_test.go
+++ b/checks/cloud/azure/database/retention_period_set_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckRetentionPeriodSet(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ExtendedAuditingPolicies: []database.ExtendedAuditingPolicy{
 							{
-								Metadata:        defsecTypes.NewTestMetadata(),
-								RetentionInDays: defsecTypes.Int(30, defsecTypes.NewTestMetadata()),
+								Metadata:        trivyTypes.NewTestMetadata(),
+								RetentionInDays: trivyTypes.Int(30, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckRetentionPeriodSet(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ExtendedAuditingPolicies: []database.ExtendedAuditingPolicy{
 							{
-								Metadata:        defsecTypes.NewTestMetadata(),
-								RetentionInDays: defsecTypes.Int(90, defsecTypes.NewTestMetadata()),
+								Metadata:        trivyTypes.NewTestMetadata(),
+								RetentionInDays: trivyTypes.Int(90, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/database/secure_tls_policy_test.go b/checks/cloud/azure/database/secure_tls_policy_test.go
index 3043145b..c26a725f 100644
--- a/checks/cloud/azure/database/secure_tls_policy_test.go
+++ b/checks/cloud/azure/database/secure_tls_policy_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckSecureTlsPolicy(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							MinimumTLSVersion: defsecTypes.String("1.0", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							MinimumTLSVersion: trivyTypes.String("1.0", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckSecureTlsPolicy(t *testing.T) {
 			input: database.Database{
 				MySQLServers: []database.MySQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							MinimumTLSVersion: defsecTypes.String("TLS1_0", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							MinimumTLSVersion: trivyTypes.String("TLS1_0", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -54,10 +54,10 @@ func TestCheckSecureTlsPolicy(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							MinimumTLSVersion: defsecTypes.String("TLS1_0", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							MinimumTLSVersion: trivyTypes.String("TLS1_0", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -69,10 +69,10 @@ func TestCheckSecureTlsPolicy(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							MinimumTLSVersion: defsecTypes.String("1.2", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							MinimumTLSVersion: trivyTypes.String("1.2", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -84,10 +84,10 @@ func TestCheckSecureTlsPolicy(t *testing.T) {
 			input: database.Database{
 				MySQLServers: []database.MySQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							MinimumTLSVersion: defsecTypes.String("TLS1_2", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							MinimumTLSVersion: trivyTypes.String("TLS1_2", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -99,10 +99,10 @@ func TestCheckSecureTlsPolicy(t *testing.T) {
 			input: database.Database{
 				PostgreSQLServers: []database.PostgreSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Server: database.Server{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							MinimumTLSVersion: defsecTypes.String("TLS1_2", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							MinimumTLSVersion: trivyTypes.String("TLS1_2", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/database/threat_alert_email_set_test.go b/checks/cloud/azure/database/threat_alert_email_set_test.go
index ef5cc38b..8b5e001e 100644
--- a/checks/cloud/azure/database/threat_alert_email_set_test.go
+++ b/checks/cloud/azure/database/threat_alert_email_set_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckThreatAlertEmailSet(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						SecurityAlertPolicies: []database.SecurityAlertPolicy{
 							{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								EmailAddresses: []defsecTypes.StringValue{},
+								Metadata:       trivyTypes.NewTestMetadata(),
+								EmailAddresses: []trivyTypes.StringValue{},
 							},
 						},
 					},
@@ -41,12 +41,12 @@ func TestCheckThreatAlertEmailSet(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						SecurityAlertPolicies: []database.SecurityAlertPolicy{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								EmailAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("sample@email.com", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								EmailAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("sample@email.com", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/azure/database/threat_alert_email_to_owner_test.go b/checks/cloud/azure/database/threat_alert_email_to_owner_test.go
index ddfe619b..73862af1 100644
--- a/checks/cloud/azure/database/threat_alert_email_to_owner_test.go
+++ b/checks/cloud/azure/database/threat_alert_email_to_owner_test.go
@@ -3,7 +3,7 @@ package database
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckThreatAlertEmailToOwner(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						SecurityAlertPolicies: []database.SecurityAlertPolicy{
 							{
-								Metadata:           defsecTypes.NewTestMetadata(),
-								EmailAccountAdmins: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:           trivyTypes.NewTestMetadata(),
+								EmailAccountAdmins: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckThreatAlertEmailToOwner(t *testing.T) {
 			input: database.Database{
 				MSSQLServers: []database.MSSQLServer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						SecurityAlertPolicies: []database.SecurityAlertPolicy{
 							{
-								Metadata:           defsecTypes.NewTestMetadata(),
-								EmailAccountAdmins: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:           trivyTypes.NewTestMetadata(),
+								EmailAccountAdmins: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/datafactory/no_public_access_test.go b/checks/cloud/azure/datafactory/no_public_access_test.go
index 37e294e2..6f121b22 100644
--- a/checks/cloud/azure/datafactory/no_public_access_test.go
+++ b/checks/cloud/azure/datafactory/no_public_access_test.go
@@ -3,7 +3,7 @@ package datafactory
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: datafactory.DataFactory{
 				DataFactories: []datafactory.Factory{
 					{
-						Metadata:            defsecTypes.NewTestMetadata(),
-						EnablePublicNetwork: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:            trivyTypes.NewTestMetadata(),
+						EnablePublicNetwork: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: datafactory.DataFactory{
 				DataFactories: []datafactory.Factory{
 					{
-						Metadata:            defsecTypes.NewTestMetadata(),
-						EnablePublicNetwork: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:            trivyTypes.NewTestMetadata(),
+						EnablePublicNetwork: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/datalake/enable_at_rest_encryption_test.go b/checks/cloud/azure/datalake/enable_at_rest_encryption_test.go
index 5ca3370e..d1e0ee44 100644
--- a/checks/cloud/azure/datalake/enable_at_rest_encryption_test.go
+++ b/checks/cloud/azure/datalake/enable_at_rest_encryption_test.go
@@ -3,7 +3,7 @@ package datalake
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: datalake.DataLake{
 				Stores: []datalake.Store{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						EnableEncryption: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						EnableEncryption: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableAtRestEncryption(t *testing.T) {
 			input: datalake.DataLake{
 				Stores: []datalake.Store{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						EnableEncryption: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						EnableEncryption: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/keyvault/content_type_for_secret_test.go b/checks/cloud/azure/keyvault/content_type_for_secret_test.go
index bd0d6f22..f468d2ed 100644
--- a/checks/cloud/azure/keyvault/content_type_for_secret_test.go
+++ b/checks/cloud/azure/keyvault/content_type_for_secret_test.go
@@ -3,7 +3,7 @@ package keyvault
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckContentTypeForSecret(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Secrets: []keyvault.Secret{
 							{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								ContentType: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								ContentType: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckContentTypeForSecret(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Secrets: []keyvault.Secret{
 							{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								ContentType: defsecTypes.String("password", defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								ContentType: trivyTypes.String("password", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/keyvault/ensure_key_expiry_test.go b/checks/cloud/azure/keyvault/ensure_key_expiry_test.go
index 61161fb3..e7cb898a 100644
--- a/checks/cloud/azure/keyvault/ensure_key_expiry_test.go
+++ b/checks/cloud/azure/keyvault/ensure_key_expiry_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,11 +25,11 @@ func TestCheckEnsureKeyExpiry(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Keys: []keyvault.Key{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								ExpiryDate: defsecTypes.Time(time.Time{}, defsecTypes.NewTestMetadata().GetMetadata()),
+								Metadata:   trivyTypes.NewTestMetadata(),
+								ExpiryDate: trivyTypes.Time(time.Time{}, trivyTypes.NewTestMetadata().GetMetadata()),
 							},
 						},
 					},
@@ -42,11 +42,11 @@ func TestCheckEnsureKeyExpiry(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Keys: []keyvault.Key{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								ExpiryDate: defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata().GetMetadata()),
+								Metadata:   trivyTypes.NewTestMetadata(),
+								ExpiryDate: trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata().GetMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/keyvault/ensure_secret_expiry_test.go b/checks/cloud/azure/keyvault/ensure_secret_expiry_test.go
index 3d77e4b3..d11c017a 100644
--- a/checks/cloud/azure/keyvault/ensure_secret_expiry_test.go
+++ b/checks/cloud/azure/keyvault/ensure_secret_expiry_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,11 +25,11 @@ func TestCheckEnsureSecretExpiry(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Secrets: []keyvault.Secret{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								ExpiryDate: defsecTypes.Time(time.Time{}, defsecTypes.NewTestMetadata().GetMetadata()),
+								Metadata:   trivyTypes.NewTestMetadata(),
+								ExpiryDate: trivyTypes.Time(time.Time{}, trivyTypes.NewTestMetadata().GetMetadata()),
 							},
 						},
 					},
@@ -42,11 +42,11 @@ func TestCheckEnsureSecretExpiry(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Secrets: []keyvault.Secret{
 							{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								ExpiryDate: defsecTypes.Time(time.Now(), defsecTypes.NewTestMetadata().GetMetadata()),
+								Metadata:   trivyTypes.NewTestMetadata(),
+								ExpiryDate: trivyTypes.Time(time.Now(), trivyTypes.NewTestMetadata().GetMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/keyvault/no_purge_test.go b/checks/cloud/azure/keyvault/no_purge_test.go
index 6d411ccd..a3866139 100644
--- a/checks/cloud/azure/keyvault/no_purge_test.go
+++ b/checks/cloud/azure/keyvault/no_purge_test.go
@@ -3,7 +3,7 @@ package keyvault
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckNoPurge(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata:                defsecTypes.NewTestMetadata(),
-						EnablePurgeProtection:   defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-						SoftDeleteRetentionDays: defsecTypes.Int(30, defsecTypes.NewTestMetadata()),
+						Metadata:                trivyTypes.NewTestMetadata(),
+						EnablePurgeProtection:   trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+						SoftDeleteRetentionDays: trivyTypes.Int(30, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -37,9 +37,9 @@ func TestCheckNoPurge(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata:                defsecTypes.NewTestMetadata(),
-						EnablePurgeProtection:   defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						SoftDeleteRetentionDays: defsecTypes.Int(3, defsecTypes.NewTestMetadata()),
+						Metadata:                trivyTypes.NewTestMetadata(),
+						EnablePurgeProtection:   trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						SoftDeleteRetentionDays: trivyTypes.Int(3, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -50,9 +50,9 @@ func TestCheckNoPurge(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata:                defsecTypes.NewTestMetadata(),
-						EnablePurgeProtection:   defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-						SoftDeleteRetentionDays: defsecTypes.Int(30, defsecTypes.NewTestMetadata()),
+						Metadata:                trivyTypes.NewTestMetadata(),
+						EnablePurgeProtection:   trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+						SoftDeleteRetentionDays: trivyTypes.Int(30, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/keyvault/specify_network_acl_test.go b/checks/cloud/azure/keyvault/specify_network_acl_test.go
index 6fd0467c..3d45da83 100644
--- a/checks/cloud/azure/keyvault/specify_network_acl_test.go
+++ b/checks/cloud/azure/keyvault/specify_network_acl_test.go
@@ -3,7 +3,7 @@ package keyvault
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckSpecifyNetworkAcl(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkACLs: keyvault.NetworkACLs{
-							Metadata:      defsecTypes.NewTestMetadata(),
-							DefaultAction: defsecTypes.String("Allow", defsecTypes.NewTestMetadata()),
+							Metadata:      trivyTypes.NewTestMetadata(),
+							DefaultAction: trivyTypes.String("Allow", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckSpecifyNetworkAcl(t *testing.T) {
 			input: keyvault.KeyVault{
 				Vaults: []keyvault.Vault{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkACLs: keyvault.NetworkACLs{
-							Metadata:      defsecTypes.NewTestMetadata(),
-							DefaultAction: defsecTypes.String("Deny", defsecTypes.NewTestMetadata()),
+							Metadata:      trivyTypes.NewTestMetadata(),
+							DefaultAction: trivyTypes.String("Deny", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/monitor/activity_log_retention_set_test.go b/checks/cloud/azure/monitor/activity_log_retention_set_test.go
index 5031a273..a9499a9b 100644
--- a/checks/cloud/azure/monitor/activity_log_retention_set_test.go
+++ b/checks/cloud/azure/monitor/activity_log_retention_set_test.go
@@ -3,7 +3,7 @@ package monitor
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckActivityLogRetentionSet(t *testing.T) {
 			input: monitor.Monitor{
 				LogProfiles: []monitor.LogProfile{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RetentionPolicy: monitor.RetentionPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							Days:     defsecTypes.Int(365, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							Days:     trivyTypes.Int(365, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckActivityLogRetentionSet(t *testing.T) {
 			input: monitor.Monitor{
 				LogProfiles: []monitor.LogProfile{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RetentionPolicy: monitor.RetentionPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Days:     defsecTypes.Int(90, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Days:     trivyTypes.Int(90, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckActivityLogRetentionSet(t *testing.T) {
 			input: monitor.Monitor{
 				LogProfiles: []monitor.LogProfile{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RetentionPolicy: monitor.RetentionPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Days:     defsecTypes.Int(365, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Days:     trivyTypes.Int(365, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/monitor/capture_all_activities_test.go b/checks/cloud/azure/monitor/capture_all_activities_test.go
index 464f071c..bc90c2b6 100644
--- a/checks/cloud/azure/monitor/capture_all_activities_test.go
+++ b/checks/cloud/azure/monitor/capture_all_activities_test.go
@@ -3,7 +3,7 @@ package monitor
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckCaptureAllActivities(t *testing.T) {
 			input: monitor.Monitor{
 				LogProfiles: []monitor.LogProfile{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Categories: []defsecTypes.StringValue{
-							defsecTypes.String("Write", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Categories: []trivyTypes.StringValue{
+							trivyTypes.String("Write", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -38,11 +38,11 @@ func TestCheckCaptureAllActivities(t *testing.T) {
 			input: monitor.Monitor{
 				LogProfiles: []monitor.LogProfile{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Categories: []defsecTypes.StringValue{
-							defsecTypes.String("Action", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("Write", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("Delete", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Categories: []trivyTypes.StringValue{
+							trivyTypes.String("Action", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("Write", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("Delete", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/monitor/capture_all_regions_test.go b/checks/cloud/azure/monitor/capture_all_regions_test.go
index 2efa7e7f..5a419da7 100644
--- a/checks/cloud/azure/monitor/capture_all_regions_test.go
+++ b/checks/cloud/azure/monitor/capture_all_regions_test.go
@@ -3,7 +3,7 @@ package monitor
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckCaptureAllRegions(t *testing.T) {
 			input: monitor.Monitor{
 				LogProfiles: []monitor.LogProfile{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Locations: []defsecTypes.StringValue{
-							defsecTypes.String("eastus", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Locations: []trivyTypes.StringValue{
+							trivyTypes.String("eastus", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -38,76 +38,76 @@ func TestCheckCaptureAllRegions(t *testing.T) {
 			input: monitor.Monitor{
 				LogProfiles: []monitor.LogProfile{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Locations: []defsecTypes.StringValue{
-							defsecTypes.String("eastus", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("eastus2", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("southcentralus", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("westus2", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("westus3", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("australiaeast", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("southeastasia", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("northeurope", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("swedencentral", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("uksouth", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("westeurope", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("centralus", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("northcentralus", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("westus", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("southafricanorth", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("centralindia", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("eastasia", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("japaneast", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("jioindiawest", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("koreacentral", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("canadacentral", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("francecentral", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("germanywestcentral", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("norwayeast", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("switzerlandnorth", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("uaenorth", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("brazilsouth", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("centralusstage", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("eastusstage", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("eastus2stage", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("northcentralusstage", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("southcentralusstage", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("westusstage", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("westus2stage", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("asia", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("asiapacific", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("australia", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("brazil", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("canada", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("europe", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("global", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("india", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("japan", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("uk", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("unitedstates", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("eastasiastage", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("southeastasiastage", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("centraluseuap", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("eastus2euap", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("westcentralus", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("southafricawest", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("australiacentral", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("australiacentral2", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("australiasoutheast", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("japanwest", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("jioindiacentral", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("koreasouth", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("southindia", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("westindia", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("canadaeast", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("francesouth", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("germanynorth", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("norwaywest", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("swedensouth", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("switzerlandwest", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("ukwest", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("uaecentral", defsecTypes.NewTestMetadata()),
-							defsecTypes.String("brazilsoutheast", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Locations: []trivyTypes.StringValue{
+							trivyTypes.String("eastus", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("eastus2", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("southcentralus", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("westus2", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("westus3", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("australiaeast", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("southeastasia", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("northeurope", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("swedencentral", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("uksouth", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("westeurope", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("centralus", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("northcentralus", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("westus", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("southafricanorth", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("centralindia", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("eastasia", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("japaneast", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("jioindiawest", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("koreacentral", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("canadacentral", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("francecentral", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("germanywestcentral", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("norwayeast", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("switzerlandnorth", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("uaenorth", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("brazilsouth", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("centralusstage", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("eastusstage", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("eastus2stage", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("northcentralusstage", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("southcentralusstage", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("westusstage", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("westus2stage", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("asia", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("asiapacific", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("australia", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("brazil", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("canada", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("europe", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("global", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("india", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("japan", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("uk", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("unitedstates", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("eastasiastage", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("southeastasiastage", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("centraluseuap", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("eastus2euap", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("westcentralus", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("southafricawest", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("australiacentral", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("australiacentral2", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("australiasoutheast", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("japanwest", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("jioindiacentral", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("koreasouth", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("southindia", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("westindia", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("canadaeast", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("francesouth", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("germanynorth", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("norwaywest", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("swedensouth", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("switzerlandwest", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("ukwest", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("uaecentral", trivyTypes.NewTestMetadata()),
+							trivyTypes.String("brazilsoutheast", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/network/disable_rdp_from_internet_test.go b/checks/cloud/azure/network/disable_rdp_from_internet_test.go
index 7a086e90..7065cb8c 100644
--- a/checks/cloud/azure/network/disable_rdp_from_internet_test.go
+++ b/checks/cloud/azure/network/disable_rdp_from_internet_test.go
@@ -3,7 +3,7 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,25 +24,25 @@ func TestCheckDisableRdpFromInternet(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Outbound: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("*", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Outbound: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("*", trivyTypes.NewTestMetadata()),
 								},
 								SourcePorts:          nil,
 								DestinationAddresses: nil,
 								DestinationPorts: []network.PortRange{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 										Start:    3310,
 										End:      3390,
 									},
 								},
-								Protocol: defsecTypes.String("Tcp", defsecTypes.NewTestMetadata()),
+								Protocol: trivyTypes.String("Tcp", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -55,23 +55,23 @@ func TestCheckDisableRdpFromInternet(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								Outbound: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								Outbound: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								DestinationPorts: []network.PortRange{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 										Start:    3310,
 										End:      3390,
 									},
 								},
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("4.53.160.75", defsecTypes.NewTestMetadata()),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("4.53.160.75", trivyTypes.NewTestMetadata()),
 								},
-								Protocol: defsecTypes.String("Tcp", defsecTypes.NewTestMetadata()),
+								Protocol: trivyTypes.String("Tcp", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -84,25 +84,25 @@ func TestCheckDisableRdpFromInternet(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Outbound: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("*", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Outbound: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("*", trivyTypes.NewTestMetadata()),
 								},
 								SourcePorts:          nil,
 								DestinationAddresses: nil,
 								DestinationPorts: []network.PortRange{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 										Start:    3310,
 										End:      3390,
 									},
 								},
-								Protocol: defsecTypes.String("Icmp", defsecTypes.NewTestMetadata()),
+								Protocol: trivyTypes.String("Icmp", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/network/no_public_egress_test.go b/checks/cloud/azure/network/no_public_egress_test.go
index 34170367..3abd1357 100644
--- a/checks/cloud/azure/network/no_public_egress_test.go
+++ b/checks/cloud/azure/network/no_public_egress_test.go
@@ -3,7 +3,7 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,14 +24,14 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								Outbound: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								DestinationAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("*", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								Outbound: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								DestinationAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("*", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -45,14 +45,14 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								Outbound: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								DestinationAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								Outbound: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								DestinationAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/azure/network/no_public_ingress_test.go b/checks/cloud/azure/network/no_public_ingress_test.go
index f5d4c0cc..72c206cb 100644
--- a/checks/cloud/azure/network/no_public_ingress_test.go
+++ b/checks/cloud/azure/network/no_public_ingress_test.go
@@ -3,7 +3,7 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,14 +24,14 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								Outbound: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("*", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								Outbound: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("*", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -45,14 +45,14 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								Outbound: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								Outbound: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/azure/network/retention_policy_set_test.go b/checks/cloud/azure/network/retention_policy_set_test.go
index 6646cafe..32b765ed 100644
--- a/checks/cloud/azure/network/retention_policy_set_test.go
+++ b/checks/cloud/azure/network/retention_policy_set_test.go
@@ -3,7 +3,7 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckRetentionPolicySet(t *testing.T) {
 			input: network.Network{
 				NetworkWatcherFlowLogs: []network.NetworkWatcherFlowLog{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RetentionPolicy: network.RetentionPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-							Days:     defsecTypes.Int(100, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+							Days:     trivyTypes.Int(100, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckRetentionPolicySet(t *testing.T) {
 			input: network.Network{
 				NetworkWatcherFlowLogs: []network.NetworkWatcherFlowLog{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RetentionPolicy: network.RetentionPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Days:     defsecTypes.Int(30, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Days:     trivyTypes.Int(30, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckRetentionPolicySet(t *testing.T) {
 			input: network.Network{
 				NetworkWatcherFlowLogs: []network.NetworkWatcherFlowLog{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						RetentionPolicy: network.RetentionPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Days:     defsecTypes.Int(100, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Days:     trivyTypes.Int(100, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/network/ssh_blocked_from_internet_test.go b/checks/cloud/azure/network/ssh_blocked_from_internet_test.go
index d83f8e09..8487eddc 100644
--- a/checks/cloud/azure/network/ssh_blocked_from_internet_test.go
+++ b/checks/cloud/azure/network/ssh_blocked_from_internet_test.go
@@ -3,7 +3,7 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,23 +24,23 @@ func TestCheckSshBlockedFromInternet(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								Outbound: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								Outbound: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								DestinationPorts: []network.PortRange{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 										Start:    22,
 										End:      22,
 									},
 								},
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("*", defsecTypes.NewTestMetadata()),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("*", trivyTypes.NewTestMetadata()),
 								},
-								Protocol: defsecTypes.String("Tcp", defsecTypes.NewTestMetadata()),
+								Protocol: trivyTypes.String("Tcp", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -53,23 +53,23 @@ func TestCheckSshBlockedFromInternet(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								Outbound: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								Outbound: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								DestinationPorts: []network.PortRange{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 										Start:    22,
 										End:      22,
 									},
 								},
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("*", defsecTypes.NewTestMetadata()),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("*", trivyTypes.NewTestMetadata()),
 								},
-								Protocol: defsecTypes.String("Icmp", defsecTypes.NewTestMetadata()),
+								Protocol: trivyTypes.String("Icmp", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -82,23 +82,23 @@ func TestCheckSshBlockedFromInternet(t *testing.T) {
 			input: network.Network{
 				SecurityGroups: []network.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []network.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Allow:    defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								Outbound: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Allow:    trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								Outbound: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								DestinationPorts: []network.PortRange{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 										Start:    22,
 										End:      22,
 									},
 								},
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("82.102.23.23", defsecTypes.NewTestMetadata()),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("82.102.23.23", trivyTypes.NewTestMetadata()),
 								},
-								Protocol: defsecTypes.String("Tcp", defsecTypes.NewTestMetadata()),
+								Protocol: trivyTypes.String("Tcp", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/securitycenter/alert_on_severe_notifications_test.go b/checks/cloud/azure/securitycenter/alert_on_severe_notifications_test.go
index 158a6d1c..b869c052 100644
--- a/checks/cloud/azure/securitycenter/alert_on_severe_notifications_test.go
+++ b/checks/cloud/azure/securitycenter/alert_on_severe_notifications_test.go
@@ -3,7 +3,7 @@ package securitycenter
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAlertOnSevereNotifications(t *testing.T) {
 			input: securitycenter.SecurityCenter{
 				Contacts: []securitycenter.Contact{
 					{
-						Metadata:                 defsecTypes.NewTestMetadata(),
-						EnableAlertNotifications: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:                 trivyTypes.NewTestMetadata(),
+						EnableAlertNotifications: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAlertOnSevereNotifications(t *testing.T) {
 			input: securitycenter.SecurityCenter{
 				Contacts: []securitycenter.Contact{
 					{
-						Metadata:                 defsecTypes.NewTestMetadata(),
-						EnableAlertNotifications: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                 trivyTypes.NewTestMetadata(),
+						EnableAlertNotifications: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/securitycenter/enable_standard_subscription_test.go b/checks/cloud/azure/securitycenter/enable_standard_subscription_test.go
index 5e430aa3..95a68c74 100644
--- a/checks/cloud/azure/securitycenter/enable_standard_subscription_test.go
+++ b/checks/cloud/azure/securitycenter/enable_standard_subscription_test.go
@@ -3,7 +3,7 @@ package securitycenter
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableStandardSubscription(t *testing.T) {
 			input: securitycenter.SecurityCenter{
 				Subscriptions: []securitycenter.SubscriptionPricing{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Tier:     defsecTypes.String(securitycenter.TierFree, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Tier:     trivyTypes.String(securitycenter.TierFree, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableStandardSubscription(t *testing.T) {
 			input: securitycenter.SecurityCenter{
 				Subscriptions: []securitycenter.SubscriptionPricing{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Tier:     defsecTypes.String(securitycenter.TierStandard, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Tier:     trivyTypes.String(securitycenter.TierStandard, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/securitycenter/set_required_contact_details_test.go b/checks/cloud/azure/securitycenter/set_required_contact_details_test.go
index e796b0e5..6b5f15ac 100644
--- a/checks/cloud/azure/securitycenter/set_required_contact_details_test.go
+++ b/checks/cloud/azure/securitycenter/set_required_contact_details_test.go
@@ -3,7 +3,7 @@ package securitycenter
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckSetRequiredContactDetails(t *testing.T) {
 			input: securitycenter.SecurityCenter{
 				Contacts: []securitycenter.Contact{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Phone:    defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Phone:    trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckSetRequiredContactDetails(t *testing.T) {
 			input: securitycenter.SecurityCenter{
 				Contacts: []securitycenter.Contact{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Phone:    defsecTypes.String("+1-555-555-5555", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Phone:    trivyTypes.String("+1-555-555-5555", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/storage/allow_microsoft_service_bypass_test.go b/checks/cloud/azure/storage/allow_microsoft_service_bypass_test.go
index 57f9b6c8..f41ca1cd 100644
--- a/checks/cloud/azure/storage/allow_microsoft_service_bypass_test.go
+++ b/checks/cloud/azure/storage/allow_microsoft_service_bypass_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckAllowMicrosoftServiceBypass(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkRules: []storage.NetworkRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Bypass:   []defsecTypes.StringValue{},
+								Metadata: trivyTypes.NewTestMetadata(),
+								Bypass:   []trivyTypes.StringValue{},
 							},
 						},
 					},
@@ -41,12 +41,12 @@ func TestCheckAllowMicrosoftServiceBypass(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkRules: []storage.NetworkRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Bypass: []defsecTypes.StringValue{
-									defsecTypes.String("AzureServices", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Bypass: []trivyTypes.StringValue{
+									trivyTypes.String("AzureServices", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/azure/storage/default_action_deny_test.go b/checks/cloud/azure/storage/default_action_deny_test.go
index 716f69a1..6be1140c 100644
--- a/checks/cloud/azure/storage/default_action_deny_test.go
+++ b/checks/cloud/azure/storage/default_action_deny_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckDefaultActionDeny(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkRules: []storage.NetworkRule{
 							{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								AllowByDefault: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								AllowByDefault: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckDefaultActionDeny(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkRules: []storage.NetworkRule{
 							{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								AllowByDefault: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								AllowByDefault: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/storage/enforce_https_test.go b/checks/cloud/azure/storage/enforce_https_test.go
index 97409be6..f5965d2f 100644
--- a/checks/cloud/azure/storage/enforce_https_test.go
+++ b/checks/cloud/azure/storage/enforce_https_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						EnforceHTTPS: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						EnforceHTTPS: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						EnforceHTTPS: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						EnforceHTTPS: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/storage/no_public_access_test.go b/checks/cloud/azure/storage/no_public_access_test.go
index 8b092ef3..bd1680ca 100644
--- a/checks/cloud/azure/storage/no_public_access_test.go
+++ b/checks/cloud/azure/storage/no_public_access_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Containers: []storage.Container{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								PublicAccess: defsecTypes.String(storage.PublicAccessBlob, defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								PublicAccess: trivyTypes.String(storage.PublicAccessBlob, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Containers: []storage.Container{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								PublicAccess: defsecTypes.String(storage.PublicAccessContainer, defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								PublicAccess: trivyTypes.String(storage.PublicAccessContainer, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -58,11 +58,11 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Containers: []storage.Container{
 							{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								PublicAccess: defsecTypes.String(storage.PublicAccessOff, defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								PublicAccess: trivyTypes.String(storage.PublicAccessOff, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/azure/storage/queue_services_logging_enabled_test.go b/checks/cloud/azure/storage/queue_services_logging_enabled_test.go
index b3d048e1..56417c08 100644
--- a/checks/cloud/azure/storage/queue_services_logging_enabled_test.go
+++ b/checks/cloud/azure/storage/queue_services_logging_enabled_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,15 +24,15 @@ func TestCheckQueueServicesLoggingEnabled(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						QueueProperties: storage.QueueProperties{
-							Metadata:      defsecTypes.NewTestMetadata(),
-							EnableLogging: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:      trivyTypes.NewTestMetadata(),
+							EnableLogging: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 						Queues: []storage.Queue{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Name:     defsecTypes.String("my-queue", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Name:     trivyTypes.String("my-queue", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -45,10 +45,10 @@ func TestCheckQueueServicesLoggingEnabled(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						QueueProperties: storage.QueueProperties{
-							Metadata:      defsecTypes.NewTestMetadata(),
-							EnableLogging: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:      trivyTypes.NewTestMetadata(),
+							EnableLogging: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -60,10 +60,10 @@ func TestCheckQueueServicesLoggingEnabled(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						QueueProperties: storage.QueueProperties{
-							Metadata:      defsecTypes.NewTestMetadata(),
-							EnableLogging: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:      trivyTypes.NewTestMetadata(),
+							EnableLogging: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/azure/storage/use_secure_tls_policy_test.go b/checks/cloud/azure/storage/use_secure_tls_policy_test.go
index 597bc89d..fa866f3f 100644
--- a/checks/cloud/azure/storage/use_secure_tls_policy_test.go
+++ b/checks/cloud/azure/storage/use_secure_tls_policy_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,7 +24,7 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 					},
 				},
 			},
@@ -35,8 +35,8 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata:          defsecTypes.NewTestMetadata(),
-						MinimumTLSVersion: defsecTypes.String("TLS1_0", defsecTypes.NewTestMetadata()),
+						Metadata:          trivyTypes.NewTestMetadata(),
+						MinimumTLSVersion: trivyTypes.String("TLS1_0", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -47,8 +47,8 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: storage.Storage{
 				Accounts: []storage.Account{
 					{
-						Metadata:          defsecTypes.NewTestMetadata(),
-						MinimumTLSVersion: defsecTypes.String("TLS1_2", defsecTypes.NewTestMetadata()),
+						Metadata:          trivyTypes.NewTestMetadata(),
+						MinimumTLSVersion: trivyTypes.String("TLS1_2", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/azure/synapse/virtual_network_enabled_test.go b/checks/cloud/azure/synapse/virtual_network_enabled_test.go
index 3e9e5d3f..3dd6daf2 100644
--- a/checks/cloud/azure/synapse/virtual_network_enabled_test.go
+++ b/checks/cloud/azure/synapse/virtual_network_enabled_test.go
@@ -3,7 +3,7 @@ package synapse
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckVirtualNetworkEnabled(t *testing.T) {
 			input: synapse.Synapse{
 				Workspaces: []synapse.Workspace{
 					{
-						Metadata:                    defsecTypes.NewTestMetadata(),
-						EnableManagedVirtualNetwork: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:                    trivyTypes.NewTestMetadata(),
+						EnableManagedVirtualNetwork: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckVirtualNetworkEnabled(t *testing.T) {
 			input: synapse.Synapse{
 				Workspaces: []synapse.Workspace{
 					{
-						Metadata:                    defsecTypes.NewTestMetadata(),
-						EnableManagedVirtualNetwork: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                    trivyTypes.NewTestMetadata(),
+						EnableManagedVirtualNetwork: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/cloudstack/compute/no_sensitive_info_test.go b/checks/cloud/cloudstack/compute/no_sensitive_info_test.go
index 7749e5da..61ccb264 100644
--- a/checks/cloud/cloudstack/compute/no_sensitive_info_test.go
+++ b/checks/cloud/cloudstack/compute/no_sensitive_info_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoSensitiveInfo(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						UserData: defsecTypes.String(` export DATABASE_PASSWORD=\"SomeSortOfPassword\"`, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						UserData: trivyTypes.String(` export DATABASE_PASSWORD=\"SomeSortOfPassword\"`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoSensitiveInfo(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						UserData: defsecTypes.String(` export GREETING="Hello there"`, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						UserData: trivyTypes.String(` export GREETING="Hello there"`, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy_test.go b/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy_test.go
index ed9f5524..98a8b5cb 100644
--- a/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy_test.go
+++ b/checks/cloud/digitalocean/compute/auto_upgrade_no_maintenance_policy_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAutoUpgrade(t *testing.T) {
 			input: compute.Compute{
 				KubernetesClusters: []compute.KubernetesCluster{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						AutoUpgrade: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						AutoUpgrade: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAutoUpgrade(t *testing.T) {
 			input: compute.Compute{
 				KubernetesClusters: []compute.KubernetesCluster{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						AutoUpgrade: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						AutoUpgrade: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/digitalocean/compute/enforce_https_test.go b/checks/cloud/digitalocean/compute/enforce_https_test.go
index 122b5d05..7ed168c8 100644
--- a/checks/cloud/digitalocean/compute/enforce_https_test.go
+++ b/checks/cloud/digitalocean/compute/enforce_https_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: compute.Compute{
 				LoadBalancers: []compute.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ForwardingRules: []compute.ForwardingRule{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								EntryProtocol: defsecTypes.String("http", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								EntryProtocol: trivyTypes.String("http", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: compute.Compute{
 				LoadBalancers: []compute.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ForwardingRules: []compute.ForwardingRule{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								EntryProtocol: defsecTypes.String("https", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								EntryProtocol: trivyTypes.String("https", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -58,12 +58,12 @@ func TestCheckEnforceHttps(t *testing.T) {
 			input: compute.Compute{
 				LoadBalancers: []compute.LoadBalancer{
 					{
-						Metadata:            defsecTypes.NewTestMetadata(),
-						RedirectHttpToHttps: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:            trivyTypes.NewTestMetadata(),
+						RedirectHttpToHttps: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						ForwardingRules: []compute.ForwardingRule{
 							{
-								Metadata:      defsecTypes.NewTestMetadata(),
-								EntryProtocol: defsecTypes.String("http", defsecTypes.NewTestMetadata()),
+								Metadata:      trivyTypes.NewTestMetadata(),
+								EntryProtocol: trivyTypes.String("http", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades_test.go b/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades_test.go
index 45e2b3d2..e2fc7c7b 100644
--- a/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades_test.go
+++ b/checks/cloud/digitalocean/compute/kubernetes_surge_upgrades_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckKubernetesSurgeUpgrades(t *testing.T) {
 			input: compute.Compute{
 				KubernetesClusters: []compute.KubernetesCluster{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						SurgeUpgrade: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						SurgeUpgrade: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckKubernetesSurgeUpgrades(t *testing.T) {
 			input: compute.Compute{
 				KubernetesClusters: []compute.KubernetesCluster{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						SurgeUpgrade: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						SurgeUpgrade: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/digitalocean/compute/no_public_egress_test.go b/checks/cloud/digitalocean/compute/no_public_egress_test.go
index 5fabfb22..4482862a 100644
--- a/checks/cloud/digitalocean/compute/no_public_egress_test.go
+++ b/checks/cloud/digitalocean/compute/no_public_egress_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: compute.Compute{
 				Firewalls: []compute.Firewall{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						OutboundRules: []compute.OutboundFirewallRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								DestinationAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
-									defsecTypes.String("::/0", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								DestinationAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
+									trivyTypes.String("::/0", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -44,12 +44,12 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: compute.Compute{
 				Firewalls: []compute.Firewall{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						OutboundRules: []compute.OutboundFirewallRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								DestinationAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("192.168.1.0/24", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								DestinationAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("192.168.1.0/24", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/digitalocean/compute/no_public_ingress_test.go b/checks/cloud/digitalocean/compute/no_public_ingress_test.go
index 9e62113a..1373d084 100644
--- a/checks/cloud/digitalocean/compute/no_public_ingress_test.go
+++ b/checks/cloud/digitalocean/compute/no_public_ingress_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: compute.Compute{
 				Firewalls: []compute.Firewall{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						InboundRules: []compute.InboundFirewallRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
-									defsecTypes.String("::/0", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
+									trivyTypes.String("::/0", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -44,12 +44,12 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: compute.Compute{
 				Firewalls: []compute.Firewall{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						InboundRules: []compute.InboundFirewallRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								SourceAddresses: []defsecTypes.StringValue{
-									defsecTypes.String("192.168.1.0/24", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								SourceAddresses: []trivyTypes.StringValue{
+									trivyTypes.String("192.168.1.0/24", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/digitalocean/compute/use_ssh_keys_test.go b/checks/cloud/digitalocean/compute/use_ssh_keys_test.go
index df2eb038..5f35af9f 100644
--- a/checks/cloud/digitalocean/compute/use_ssh_keys_test.go
+++ b/checks/cloud/digitalocean/compute/use_ssh_keys_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckUseSshKeys(t *testing.T) {
 			input: compute.Compute{
 				Droplets: []compute.Droplet{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						SSHKeys:  []defsecTypes.StringValue{},
+						Metadata: trivyTypes.NewTestMetadata(),
+						SSHKeys:  []trivyTypes.StringValue{},
 					},
 				},
 			},
@@ -36,9 +36,9 @@ func TestCheckUseSshKeys(t *testing.T) {
 			input: compute.Compute{
 				Droplets: []compute.Droplet{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						SSHKeys: []defsecTypes.StringValue{
-							defsecTypes.String("my-ssh-key", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						SSHKeys: []trivyTypes.StringValue{
+							trivyTypes.String("my-ssh-key", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/digitalocean/spaces/acl_no_public_read_test.go b/checks/cloud/digitalocean/spaces/acl_no_public_read_test.go
index bd5170b6..082dcfdd 100644
--- a/checks/cloud/digitalocean/spaces/acl_no_public_read_test.go
+++ b/checks/cloud/digitalocean/spaces/acl_no_public_read_test.go
@@ -3,7 +3,7 @@ package spaces
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAclNoPublicRead(t *testing.T) {
 			input: spaces.Spaces{
 				Buckets: []spaces.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						ACL:      defsecTypes.String("public-read", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						ACL:      trivyTypes.String("public-read", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,12 +36,12 @@ func TestCheckAclNoPublicRead(t *testing.T) {
 			input: spaces.Spaces{
 				Buckets: []spaces.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						ACL:      defsecTypes.String("private", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						ACL:      trivyTypes.String("private", trivyTypes.NewTestMetadata()),
 						Objects: []spaces.Object{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ACL:      defsecTypes.String("public-read", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ACL:      trivyTypes.String("public-read", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -54,12 +54,12 @@ func TestCheckAclNoPublicRead(t *testing.T) {
 			input: spaces.Spaces{
 				Buckets: []spaces.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						ACL:      defsecTypes.String("private", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						ACL:      trivyTypes.String("private", trivyTypes.NewTestMetadata()),
 						Objects: []spaces.Object{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								ACL:      defsecTypes.String("private", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								ACL:      trivyTypes.String("private", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/digitalocean/spaces/disable_force_destroy_test.go b/checks/cloud/digitalocean/spaces/disable_force_destroy_test.go
index 743eac10..2000b77f 100644
--- a/checks/cloud/digitalocean/spaces/disable_force_destroy_test.go
+++ b/checks/cloud/digitalocean/spaces/disable_force_destroy_test.go
@@ -3,7 +3,7 @@ package spaces
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckDisableForceDestroy(t *testing.T) {
 			input: spaces.Spaces{
 				Buckets: []spaces.Bucket{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						ForceDestroy: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						ForceDestroy: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckDisableForceDestroy(t *testing.T) {
 			input: spaces.Spaces{
 				Buckets: []spaces.Bucket{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						ForceDestroy: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						ForceDestroy: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/digitalocean/spaces/versioning_enabled_test.go b/checks/cloud/digitalocean/spaces/versioning_enabled_test.go
index 583d53cd..1f16955f 100644
--- a/checks/cloud/digitalocean/spaces/versioning_enabled_test.go
+++ b/checks/cloud/digitalocean/spaces/versioning_enabled_test.go
@@ -3,7 +3,7 @@ package spaces
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckVersioningEnabled(t *testing.T) {
 			input: spaces.Spaces{
 				Buckets: []spaces.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Versioning: spaces.Versioning{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckVersioningEnabled(t *testing.T) {
 			input: spaces.Spaces{
 				Buckets: []spaces.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Versioning: spaces.Versioning{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/github/actions/no_plain_text_action_secrets_test.go b/checks/cloud/github/actions/no_plain_text_action_secrets_test.go
index daf2d5ba..d2b5dd3e 100644
--- a/checks/cloud/github/actions/no_plain_text_action_secrets_test.go
+++ b/checks/cloud/github/actions/no_plain_text_action_secrets_test.go
@@ -3,7 +3,7 @@ package actions
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckNoPlainTextActionEnvironmentSecrets(t *testing.T) {
 			name: "Github actions environment secret has plain text value",
 			input: []github.EnvironmentSecret{
 				{
-					Metadata:       defsecTypes.NewTestMetadata(),
-					PlainTextValue: defsecTypes.String("sensitive secret string", defsecTypes.NewTestMetadata()),
+					Metadata:       trivyTypes.NewTestMetadata(),
+					PlainTextValue: trivyTypes.String("sensitive secret string", trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckNoPlainTextActionEnvironmentSecrets(t *testing.T) {
 			name: "Github actions environment secret has no plain text value",
 			input: []github.EnvironmentSecret{
 				{
-					Metadata:       defsecTypes.NewTestMetadata(),
-					PlainTextValue: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+					Metadata:       trivyTypes.NewTestMetadata(),
+					PlainTextValue: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/github/branch_protections/require_signed_commits_test.go b/checks/cloud/github/branch_protections/require_signed_commits_test.go
index 4945e8d1..08b64158 100644
--- a/checks/cloud/github/branch_protections/require_signed_commits_test.go
+++ b/checks/cloud/github/branch_protections/require_signed_commits_test.go
@@ -3,7 +3,7 @@ package branch_protections
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckRequireSignedCommits(t *testing.T) {
 			name: "Require signed commits enabled for branch",
 			input: []github.BranchProtection{
 				{
-					Metadata:             defsecTypes.NewTestMetadata(),
-					RequireSignedCommits: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+					Metadata:             trivyTypes.NewTestMetadata(),
+					RequireSignedCommits: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
@@ -33,8 +33,8 @@ func TestCheckRequireSignedCommits(t *testing.T) {
 			name: "Require signed commits disabled for repository",
 			input: []github.BranchProtection{
 				{
-					Metadata:             defsecTypes.NewTestMetadata(),
-					RequireSignedCommits: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata:             trivyTypes.NewTestMetadata(),
+					RequireSignedCommits: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
diff --git a/checks/cloud/github/repositories/enable_vulnerability_alerts_test.go b/checks/cloud/github/repositories/enable_vulnerability_alerts_test.go
index 75d81c3b..b6d2cd3d 100644
--- a/checks/cloud/github/repositories/enable_vulnerability_alerts_test.go
+++ b/checks/cloud/github/repositories/enable_vulnerability_alerts_test.go
@@ -3,7 +3,7 @@ package repositories
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,9 +23,9 @@ func TestCheckEnableVulnerabilityAlerts(t *testing.T) {
 			name: "Vulnerability alerts enabled for repository",
 			input: []github.Repository{
 				{
-					Metadata:            defsecTypes.NewTestMetadata(),
-					VulnerabilityAlerts: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-					Archived:            defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata:            trivyTypes.NewTestMetadata(),
+					VulnerabilityAlerts: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+					Archived:            trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
@@ -34,9 +34,9 @@ func TestCheckEnableVulnerabilityAlerts(t *testing.T) {
 			name: "Vulnerability alerts disabled for repository",
 			input: []github.Repository{
 				{
-					Metadata:            defsecTypes.NewTestMetadata(),
-					VulnerabilityAlerts: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-					Archived:            defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata:            trivyTypes.NewTestMetadata(),
+					VulnerabilityAlerts: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+					Archived:            trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -45,9 +45,9 @@ func TestCheckEnableVulnerabilityAlerts(t *testing.T) {
 			name: "Vulnerability alerts disabled for archived repository",
 			input: []github.Repository{
 				{
-					Metadata:            defsecTypes.NewTestMetadata(),
-					VulnerabilityAlerts: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-					Archived:            defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+					Metadata:            trivyTypes.NewTestMetadata(),
+					VulnerabilityAlerts: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+					Archived:            trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/github/repositories/private_test.go b/checks/cloud/github/repositories/private_test.go
index a979ac6a..d2f11921 100644
--- a/checks/cloud/github/repositories/private_test.go
+++ b/checks/cloud/github/repositories/private_test.go
@@ -3,7 +3,7 @@ package repositories
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckPrivate(t *testing.T) {
 			name: "Public repository",
 			input: []github.Repository{
 				{
-					Metadata: defsecTypes.NewTestMetadata(),
-					Public:   defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+					Metadata: trivyTypes.NewTestMetadata(),
+					Public:   trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckPrivate(t *testing.T) {
 			name: "Private repository",
 			input: []github.Repository{
 				{
-					Metadata: defsecTypes.NewTestMetadata(),
-					Public:   defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata: trivyTypes.NewTestMetadata(),
+					Public:   trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/google/bigquery/no_public_access_test.go b/checks/cloud/google/bigquery/no_public_access_test.go
index 181f8d98..003415e9 100644
--- a/checks/cloud/google/bigquery/no_public_access_test.go
+++ b/checks/cloud/google/bigquery/no_public_access_test.go
@@ -3,7 +3,7 @@ package bigquery
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: bigquery.BigQuery{
 				Datasets: []bigquery.Dataset{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AccessGrants: []bigquery.AccessGrant{
 							{
-								SpecialGroup: defsecTypes.String(
+								SpecialGroup: trivyTypes.String(
 									bigquery.SpecialGroupAllAuthenticatedUsers,
-									defsecTypes.NewTestMetadata(),
+									trivyTypes.NewTestMetadata(),
 								),
 							},
 						},
@@ -43,12 +43,12 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: bigquery.BigQuery{
 				Datasets: []bigquery.Dataset{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AccessGrants: []bigquery.AccessGrant{
 							{
-								SpecialGroup: defsecTypes.String(
+								SpecialGroup: trivyTypes.String(
 									"anotherGroup",
-									defsecTypes.NewTestMetadata(),
+									trivyTypes.NewTestMetadata(),
 								),
 							},
 						},
diff --git a/checks/cloud/google/compute/disk_encryption_customer_key_test.go b/checks/cloud/google/compute/disk_encryption_customer_key_test.go
index 44838c2d..de3675c8 100644
--- a/checks/cloud/google/compute/disk_encryption_customer_key_test.go
+++ b/checks/cloud/google/compute/disk_encryption_customer_key_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckDiskEncryptionCustomerKey(t *testing.T) {
 			input: compute.Compute{
 				Disks: []compute.Disk{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: compute.DiskEncryption{
-							Metadata:   defsecTypes.NewTestMetadata(),
-							KMSKeyLink: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:   trivyTypes.NewTestMetadata(),
+							KMSKeyLink: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckDiskEncryptionCustomerKey(t *testing.T) {
 			input: compute.Compute{
 				Disks: []compute.Disk{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: compute.DiskEncryption{
-							Metadata:   defsecTypes.NewTestMetadata(),
-							KMSKeyLink: defsecTypes.String("kms-key-link", defsecTypes.NewTestMetadata()),
+							Metadata:   trivyTypes.NewTestMetadata(),
+							KMSKeyLink: trivyTypes.String("kms-key-link", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/compute/disk_encryption_no_plaintext_key_test.go b/checks/cloud/google/compute/disk_encryption_no_plaintext_key_test.go
index 222e8f41..89fa43bb 100644
--- a/checks/cloud/google/compute/disk_encryption_no_plaintext_key_test.go
+++ b/checks/cloud/google/compute/disk_encryption_no_plaintext_key_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckDiskEncryptionRequired(t *testing.T) {
 			input: compute.Compute{
 				Disks: []compute.Disk{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: compute.DiskEncryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							RawKey:   defsecTypes.Bytes([]byte("b2ggbm8gdGhpcyBpcyBiYWQ"), defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							RawKey:   trivyTypes.Bytes([]byte("b2ggbm8gdGhpcyBpcyBiYWQ"), trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,13 +39,13 @@ func TestCheckDiskEncryptionRequired(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						BootDisks: []compute.Disk{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Encryption: compute.DiskEncryption{
-									Metadata: defsecTypes.NewTestMetadata(),
-									RawKey:   defsecTypes.Bytes([]byte("b2ggbm8gdGhpcyBpcyBiYWQ"), defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									RawKey:   trivyTypes.Bytes([]byte("b2ggbm8gdGhpcyBpcyBiYWQ"), trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -59,31 +59,31 @@ func TestCheckDiskEncryptionRequired(t *testing.T) {
 			input: compute.Compute{
 				Disks: []compute.Disk{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: compute.DiskEncryption{
-							Metadata: defsecTypes.NewTestMetadata(),
-							RawKey:   defsecTypes.Bytes([]byte(""), defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							RawKey:   trivyTypes.Bytes([]byte(""), trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						BootDisks: []compute.Disk{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Encryption: compute.DiskEncryption{
-									Metadata: defsecTypes.NewTestMetadata(),
-									RawKey:   defsecTypes.Bytes([]byte(""), defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									RawKey:   trivyTypes.Bytes([]byte(""), trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
 						AttachedDisks: []compute.Disk{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Encryption: compute.DiskEncryption{
-									Metadata: defsecTypes.NewTestMetadata(),
-									RawKey:   defsecTypes.Bytes([]byte(""), defsecTypes.NewTestMetadata()),
+									Metadata: trivyTypes.NewTestMetadata(),
+									RawKey:   trivyTypes.Bytes([]byte(""), trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/google/compute/enable_shielded_vm_im_test.go b/checks/cloud/google/compute/enable_shielded_vm_im_test.go
index 74c7d7d3..94f768be 100644
--- a/checks/cloud/google/compute/enable_shielded_vm_im_test.go
+++ b/checks/cloud/google/compute/enable_shielded_vm_im_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableShieldedVMIntegrityMonitoring(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ShieldedVM: compute.ShieldedVMConfig{
-							Metadata:                   defsecTypes.NewTestMetadata(),
-							IntegrityMonitoringEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:                   trivyTypes.NewTestMetadata(),
+							IntegrityMonitoringEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableShieldedVMIntegrityMonitoring(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ShieldedVM: compute.ShieldedVMConfig{
-							Metadata:                   defsecTypes.NewTestMetadata(),
-							IntegrityMonitoringEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:                   trivyTypes.NewTestMetadata(),
+							IntegrityMonitoringEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/compute/enable_shielded_vm_sb_test.go b/checks/cloud/google/compute/enable_shielded_vm_sb_test.go
index 07168a3a..a4f948e4 100644
--- a/checks/cloud/google/compute/enable_shielded_vm_sb_test.go
+++ b/checks/cloud/google/compute/enable_shielded_vm_sb_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableShieldedVMSecureBoot(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ShieldedVM: compute.ShieldedVMConfig{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							SecureBootEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							SecureBootEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableShieldedVMSecureBoot(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ShieldedVM: compute.ShieldedVMConfig{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							SecureBootEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							SecureBootEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/compute/enable_shielded_vm_vtpm_test.go b/checks/cloud/google/compute/enable_shielded_vm_vtpm_test.go
index 9d5fdf29..40925a81 100644
--- a/checks/cloud/google/compute/enable_shielded_vm_vtpm_test.go
+++ b/checks/cloud/google/compute/enable_shielded_vm_vtpm_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableShieldedVMVTPM(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ShieldedVM: compute.ShieldedVMConfig{
-							Metadata:    defsecTypes.NewTestMetadata(),
-							VTPMEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:    trivyTypes.NewTestMetadata(),
+							VTPMEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableShieldedVMVTPM(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ShieldedVM: compute.ShieldedVMConfig{
-							Metadata:    defsecTypes.NewTestMetadata(),
-							VTPMEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:    trivyTypes.NewTestMetadata(),
+							VTPMEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/compute/enable_vpc_flow_logs_test.go b/checks/cloud/google/compute/enable_vpc_flow_logs_test.go
index b4fbe7fc..30a31292 100644
--- a/checks/cloud/google/compute/enable_vpc_flow_logs_test.go
+++ b/checks/cloud/google/compute/enable_vpc_flow_logs_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEnableVPCFlowLogs(t *testing.T) {
 			input: compute.Compute{
 				Networks: []compute.Network{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Subnetworks: []compute.SubNetwork{
 							{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								EnableFlowLogs: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								EnableFlowLogs: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckEnableVPCFlowLogs(t *testing.T) {
 			input: compute.Compute{
 				Networks: []compute.Network{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Subnetworks: []compute.SubNetwork{
 							{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								EnableFlowLogs: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								EnableFlowLogs: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -58,12 +58,12 @@ func TestCheckEnableVPCFlowLogs(t *testing.T) {
 			input: compute.Compute{
 				Networks: []compute.Network{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Subnetworks: []compute.SubNetwork{
 							{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								EnableFlowLogs: defsecTypes.BoolDefault(false, defsecTypes.NewTestMetadata()),
-								Purpose:        defsecTypes.String("REGIONAL_MANAGED_PROXY", defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								EnableFlowLogs: trivyTypes.BoolDefault(false, trivyTypes.NewTestMetadata()),
+								Purpose:        trivyTypes.String("REGIONAL_MANAGED_PROXY", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/compute/no_default_service_account_test.go b/checks/cloud/google/compute/no_default_service_account_test.go
index 64663202..a6aaab82 100644
--- a/checks/cloud/google/compute/no_default_service_account_test.go
+++ b/checks/cloud/google/compute/no_default_service_account_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckNoDefaultServiceAccount(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ServiceAccount: compute.ServiceAccount{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							Email:     defsecTypes.String("", defsecTypes.NewTestMetadata()),
-							IsDefault: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							Email:     trivyTypes.String("", trivyTypes.NewTestMetadata()),
+							IsDefault: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckNoDefaultServiceAccount(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ServiceAccount: compute.ServiceAccount{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							Email:     defsecTypes.String("1234567890-compute@developer.gserviceaccount.com", defsecTypes.NewTestMetadata()),
-							IsDefault: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							Email:     trivyTypes.String("1234567890-compute@developer.gserviceaccount.com", trivyTypes.NewTestMetadata()),
+							IsDefault: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckNoDefaultServiceAccount(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						ServiceAccount: compute.ServiceAccount{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							Email:     defsecTypes.String("proper@email.com", defsecTypes.NewTestMetadata()),
-							IsDefault: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							Email:     trivyTypes.String("proper@email.com", trivyTypes.NewTestMetadata()),
+							IsDefault: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/compute/no_ip_forwarding_test.go b/checks/cloud/google/compute/no_ip_forwarding_test.go
index bc35acdf..24f7df6d 100644
--- a/checks/cloud/google/compute/no_ip_forwarding_test.go
+++ b/checks/cloud/google/compute/no_ip_forwarding_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoIpForwarding(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						CanIPForward: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						CanIPForward: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoIpForwarding(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						CanIPForward: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						CanIPForward: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/compute/no_oslogin_override_test.go b/checks/cloud/google/compute/no_oslogin_override_test.go
index 5002482b..7704dfa6 100644
--- a/checks/cloud/google/compute/no_oslogin_override_test.go
+++ b/checks/cloud/google/compute/no_oslogin_override_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoOsloginOverride(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata:       defsecTypes.NewTestMetadata(),
-						OSLoginEnabled: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:       trivyTypes.NewTestMetadata(),
+						OSLoginEnabled: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoOsloginOverride(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata:       defsecTypes.NewTestMetadata(),
-						OSLoginEnabled: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:       trivyTypes.NewTestMetadata(),
+						OSLoginEnabled: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/compute/no_project_wide_ssh_keys_test.go b/checks/cloud/google/compute/no_project_wide_ssh_keys_test.go
index ed214b1d..981f9d45 100644
--- a/checks/cloud/google/compute/no_project_wide_ssh_keys_test.go
+++ b/checks/cloud/google/compute/no_project_wide_ssh_keys_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoProjectWideSshKeys(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata:                    defsecTypes.NewTestMetadata(),
-						EnableProjectSSHKeyBlocking: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:                    trivyTypes.NewTestMetadata(),
+						EnableProjectSSHKeyBlocking: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoProjectWideSshKeys(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata:                    defsecTypes.NewTestMetadata(),
-						EnableProjectSSHKeyBlocking: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                    trivyTypes.NewTestMetadata(),
+						EnableProjectSSHKeyBlocking: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/compute/no_public_egress_test.go b/checks/cloud/google/compute/no_public_egress_test.go
index 1633203d..a1c7250b 100644
--- a/checks/cloud/google/compute/no_public_egress_test.go
+++ b/checks/cloud/google/compute/no_public_egress_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,20 +24,20 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: compute.Compute{
 				Networks: []compute.Network{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Firewall: &compute.Firewall{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							EgressRules: []compute.EgressRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
+									Metadata: trivyTypes.NewTestMetadata(),
 									FirewallRule: compute.FirewallRule{
-										Metadata: defsecTypes.NewTestMetadata(),
-										IsAllow:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-										Enforced: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										IsAllow:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+										Enforced: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 									},
-									DestinationRanges: []defsecTypes.StringValue{
-										defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
-										defsecTypes.String("1.2.3.4/32", defsecTypes.NewTestMetadata()),
+									DestinationRanges: []trivyTypes.StringValue{
+										trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
+										trivyTypes.String("1.2.3.4/32", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -52,19 +52,19 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: compute.Compute{
 				Networks: []compute.Network{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Firewall: &compute.Firewall{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							EgressRules: []compute.EgressRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
+									Metadata: trivyTypes.NewTestMetadata(),
 									FirewallRule: compute.FirewallRule{
-										Metadata: defsecTypes.NewTestMetadata(),
-										IsAllow:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-										Enforced: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										IsAllow:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+										Enforced: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 									},
-									DestinationRanges: []defsecTypes.StringValue{
-										defsecTypes.String("1.2.3.4/32", defsecTypes.NewTestMetadata()),
+									DestinationRanges: []trivyTypes.StringValue{
+										trivyTypes.String("1.2.3.4/32", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/google/compute/no_public_ingress_test.go b/checks/cloud/google/compute/no_public_ingress_test.go
index 3f4e1cef..b5da484c 100644
--- a/checks/cloud/google/compute/no_public_ingress_test.go
+++ b/checks/cloud/google/compute/no_public_ingress_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,20 +24,20 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: compute.Compute{
 				Networks: []compute.Network{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Firewall: &compute.Firewall{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							IngressRules: []compute.IngressRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
+									Metadata: trivyTypes.NewTestMetadata(),
 									FirewallRule: compute.FirewallRule{
-										Metadata: defsecTypes.NewTestMetadata(),
-										IsAllow:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-										Enforced: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										IsAllow:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+										Enforced: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 									},
-									SourceRanges: []defsecTypes.StringValue{
-										defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
-										defsecTypes.String("1.2.3.4/32", defsecTypes.NewTestMetadata()),
+									SourceRanges: []trivyTypes.StringValue{
+										trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
+										trivyTypes.String("1.2.3.4/32", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -52,19 +52,19 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: compute.Compute{
 				Networks: []compute.Network{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Firewall: &compute.Firewall{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							IngressRules: []compute.IngressRule{
 								{
-									Metadata: defsecTypes.NewTestMetadata(),
+									Metadata: trivyTypes.NewTestMetadata(),
 									FirewallRule: compute.FirewallRule{
-										Metadata: defsecTypes.NewTestMetadata(),
-										IsAllow:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-										Enforced: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										IsAllow:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+										Enforced: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 									},
-									SourceRanges: []defsecTypes.StringValue{
-										defsecTypes.String("1.2.3.4/32", defsecTypes.NewTestMetadata()),
+									SourceRanges: []trivyTypes.StringValue{
+										trivyTypes.String("1.2.3.4/32", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/google/compute/no_public_ip_test.go b/checks/cloud/google/compute/no_public_ip_test.go
index 95b5cbec..8855a5a7 100755
--- a/checks/cloud/google/compute/no_public_ip_test.go
+++ b/checks/cloud/google/compute/no_public_ip_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckInstancesDoNotHavePublicIPs(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []compute.NetworkInterface{
 							{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								HasPublicIP: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								HasPublicIP: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckInstancesDoNotHavePublicIPs(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []compute.NetworkInterface{
 							{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								HasPublicIP: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								HasPublicIP: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/compute/no_serial_port_test.go b/checks/cloud/google/compute/no_serial_port_test.go
index f4845141..7334a661 100644
--- a/checks/cloud/google/compute/no_serial_port_test.go
+++ b/checks/cloud/google/compute/no_serial_port_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoSerialPort(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						EnableSerialPort: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						EnableSerialPort: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoSerialPort(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						EnableSerialPort: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						EnableSerialPort: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/compute/project_level_oslogin_test.go b/checks/cloud/google/compute/project_level_oslogin_test.go
index 66e33f3b..6c16f198 100644
--- a/checks/cloud/google/compute/project_level_oslogin_test.go
+++ b/checks/cloud/google/compute/project_level_oslogin_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,8 +23,8 @@ func TestCheckProjectLevelOslogin(t *testing.T) {
 			name: "Compute OS login disabled",
 			input: compute.Compute{
 				ProjectMetadata: compute.ProjectMetadata{
-					Metadata:      defsecTypes.NewTestMetadata(),
-					EnableOSLogin: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+					Metadata:      trivyTypes.NewTestMetadata(),
+					EnableOSLogin: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: true,
@@ -33,8 +33,8 @@ func TestCheckProjectLevelOslogin(t *testing.T) {
 			name: "Compute OS login enabled",
 			input: compute.Compute{
 				ProjectMetadata: compute.ProjectMetadata{
-					Metadata:      defsecTypes.NewTestMetadata(),
-					EnableOSLogin: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+					Metadata:      trivyTypes.NewTestMetadata(),
+					EnableOSLogin: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 				},
 			},
 			expected: false,
diff --git a/checks/cloud/google/compute/use_secure_tls_policy_test.go b/checks/cloud/google/compute/use_secure_tls_policy_test.go
index 44051b52..5da9f4ca 100644
--- a/checks/cloud/google/compute/use_secure_tls_policy_test.go
+++ b/checks/cloud/google/compute/use_secure_tls_policy_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: compute.Compute{
 				SSLPolicies: []compute.SSLPolicy{
 					{
-						Metadata:          defsecTypes.NewTestMetadata(),
-						MinimumTLSVersion: defsecTypes.String("TLS_1_0", defsecTypes.NewTestMetadata()),
+						Metadata:          trivyTypes.NewTestMetadata(),
+						MinimumTLSVersion: trivyTypes.String("TLS_1_0", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: compute.Compute{
 				SSLPolicies: []compute.SSLPolicy{
 					{
-						Metadata:          defsecTypes.NewTestMetadata(),
-						MinimumTLSVersion: defsecTypes.String("TLS_1_2", defsecTypes.NewTestMetadata()),
+						Metadata:          trivyTypes.NewTestMetadata(),
+						MinimumTLSVersion: trivyTypes.String("TLS_1_2", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/compute/vm_disk_encryption_customer_key_test.go b/checks/cloud/google/compute/vm_disk_encryption_customer_key_test.go
index c9d39162..2bbcccdf 100644
--- a/checks/cloud/google/compute/vm_disk_encryption_customer_key_test.go
+++ b/checks/cloud/google/compute/vm_disk_encryption_customer_key_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckVmDiskEncryptionCustomerKey(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						BootDisks: []compute.Disk{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Encryption: compute.DiskEncryption{
-									Metadata:   defsecTypes.NewTestMetadata(),
-									KMSKeyLink: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+									Metadata:   trivyTypes.NewTestMetadata(),
+									KMSKeyLink: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -44,13 +44,13 @@ func TestCheckVmDiskEncryptionCustomerKey(t *testing.T) {
 			input: compute.Compute{
 				Instances: []compute.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						AttachedDisks: []compute.Disk{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Encryption: compute.DiskEncryption{
-									Metadata:   defsecTypes.NewTestMetadata(),
-									KMSKeyLink: defsecTypes.String("kms-key-link", defsecTypes.NewTestMetadata()),
+									Metadata:   trivyTypes.NewTestMetadata(),
+									KMSKeyLink: trivyTypes.String("kms-key-link", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/google/dns/enable_dnssec_test.go b/checks/cloud/google/dns/enable_dnssec_test.go
index 4a0fb1e7..6305e45c 100644
--- a/checks/cloud/google/dns/enable_dnssec_test.go
+++ b/checks/cloud/google/dns/enable_dnssec_test.go
@@ -3,7 +3,7 @@ package dns
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckEnableDnssec(t *testing.T) {
 			input: dns.DNS{
 				ManagedZones: []dns.ManagedZone{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Visibility: defsecTypes.String("public", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Visibility: trivyTypes.String("public", trivyTypes.NewTestMetadata()),
 						DNSSec: dns.DNSSec{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckEnableDnssec(t *testing.T) {
 			input: dns.DNS{
 				ManagedZones: []dns.ManagedZone{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Visibility: defsecTypes.String("public", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Visibility: trivyTypes.String("public", trivyTypes.NewTestMetadata()),
 						DNSSec: dns.DNSSec{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -56,11 +56,11 @@ func TestCheckEnableDnssec(t *testing.T) {
 			input: dns.DNS{
 				ManagedZones: []dns.ManagedZone{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Visibility: defsecTypes.String("private", defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Visibility: trivyTypes.String("private", trivyTypes.NewTestMetadata()),
 						DNSSec: dns.DNSSec{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/dns/no_rsa_sha1_test.go b/checks/cloud/google/dns/no_rsa_sha1_test.go
index b385b09f..a456d242 100644
--- a/checks/cloud/google/dns/no_rsa_sha1_test.go
+++ b/checks/cloud/google/dns/no_rsa_sha1_test.go
@@ -3,7 +3,7 @@ package dns
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,19 +24,19 @@ func TestCheckNoRsaSha1(t *testing.T) {
 			input: dns.DNS{
 				ManagedZones: []dns.ManagedZone{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						DNSSec: dns.DNSSec{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							DefaultKeySpecs: []dns.KeySpecs{
 								{
-									Metadata:  defsecTypes.NewTestMetadata(),
-									Algorithm: defsecTypes.String("rsasha1", defsecTypes.NewTestMetadata()),
-									KeyType:   defsecTypes.String("keySigning", defsecTypes.NewTestMetadata()),
+									Metadata:  trivyTypes.NewTestMetadata(),
+									Algorithm: trivyTypes.String("rsasha1", trivyTypes.NewTestMetadata()),
+									KeyType:   trivyTypes.String("keySigning", trivyTypes.NewTestMetadata()),
 								},
 								{
-									Metadata:  defsecTypes.NewTestMetadata(),
-									Algorithm: defsecTypes.String("rsasha1", defsecTypes.NewTestMetadata()),
-									KeyType:   defsecTypes.String("zoneSigning", defsecTypes.NewTestMetadata()),
+									Metadata:  trivyTypes.NewTestMetadata(),
+									Algorithm: trivyTypes.String("rsasha1", trivyTypes.NewTestMetadata()),
+									KeyType:   trivyTypes.String("zoneSigning", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -50,19 +50,19 @@ func TestCheckNoRsaSha1(t *testing.T) {
 			input: dns.DNS{
 				ManagedZones: []dns.ManagedZone{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						DNSSec: dns.DNSSec{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							DefaultKeySpecs: []dns.KeySpecs{
 								{
-									Metadata:  defsecTypes.NewTestMetadata(),
-									Algorithm: defsecTypes.String("rsasha512", defsecTypes.NewTestMetadata()),
-									KeyType:   defsecTypes.String("keySigning", defsecTypes.NewTestMetadata()),
+									Metadata:  trivyTypes.NewTestMetadata(),
+									Algorithm: trivyTypes.String("rsasha512", trivyTypes.NewTestMetadata()),
+									KeyType:   trivyTypes.String("keySigning", trivyTypes.NewTestMetadata()),
 								},
 								{
-									Metadata:  defsecTypes.NewTestMetadata(),
-									Algorithm: defsecTypes.String("rsasha512", defsecTypes.NewTestMetadata()),
-									KeyType:   defsecTypes.String("zoneSigning", defsecTypes.NewTestMetadata()),
+									Metadata:  trivyTypes.NewTestMetadata(),
+									Algorithm: trivyTypes.String("rsasha512", trivyTypes.NewTestMetadata()),
+									KeyType:   trivyTypes.String("zoneSigning", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/google/gke/enable_auto_repair_test.go b/checks/cloud/google/gke/enable_auto_repair_test.go
index 0d0b871b..18c47c65 100644
--- a/checks/cloud/google/gke/enable_auto_repair_test.go
+++ b/checks/cloud/google/gke/enable_auto_repair_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckEnableAutoRepair(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodePools: []gke.NodePool{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Management: gke.Management{
-									Metadata:         defsecTypes.NewTestMetadata(),
-									EnableAutoRepair: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+									Metadata:         trivyTypes.NewTestMetadata(),
+									EnableAutoRepair: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -44,13 +44,13 @@ func TestCheckEnableAutoRepair(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodePools: []gke.NodePool{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Management: gke.Management{
-									Metadata:         defsecTypes.NewTestMetadata(),
-									EnableAutoRepair: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+									Metadata:         trivyTypes.NewTestMetadata(),
+									EnableAutoRepair: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/google/gke/enable_auto_upgrade_test.go b/checks/cloud/google/gke/enable_auto_upgrade_test.go
index 01208ad5..64b17aca 100644
--- a/checks/cloud/google/gke/enable_auto_upgrade_test.go
+++ b/checks/cloud/google/gke/enable_auto_upgrade_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckEnableAutoUpgrade(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodePools: []gke.NodePool{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Management: gke.Management{
-									Metadata:          defsecTypes.NewTestMetadata(),
-									EnableAutoUpgrade: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+									Metadata:          trivyTypes.NewTestMetadata(),
+									EnableAutoUpgrade: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -44,13 +44,13 @@ func TestCheckEnableAutoUpgrade(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodePools: []gke.NodePool{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Management: gke.Management{
-									Metadata:          defsecTypes.NewTestMetadata(),
-									EnableAutoUpgrade: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+									Metadata:          trivyTypes.NewTestMetadata(),
+									EnableAutoUpgrade: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/google/gke/enable_ip_aliasing_test.go b/checks/cloud/google/gke/enable_ip_aliasing_test.go
index 9e43e6cb..3344d788 100644
--- a/checks/cloud/google/gke/enable_ip_aliasing_test.go
+++ b/checks/cloud/google/gke/enable_ip_aliasing_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableIpAliasing(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IPAllocationPolicy: gke.IPAllocationPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableIpAliasing(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IPAllocationPolicy: gke.IPAllocationPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/gke/enable_master_networks_test.go b/checks/cloud/google/gke/enable_master_networks_test.go
index 37677f02..ddd99bbb 100644
--- a/checks/cloud/google/gke/enable_master_networks_test.go
+++ b/checks/cloud/google/gke/enable_master_networks_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableMasterNetworks(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MasterAuthorizedNetworks: gke.MasterAuthorizedNetworks{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableMasterNetworks(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MasterAuthorizedNetworks: gke.MasterAuthorizedNetworks{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/gke/enable_network_policy_test.go b/checks/cloud/google/gke/enable_network_policy_test.go
index cb7e32c6..2b4686f3 100644
--- a/checks/cloud/google/gke/enable_network_policy_test.go
+++ b/checks/cloud/google/gke/enable_network_policy_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnableNetworkPolicy(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkPolicy: gke.NetworkPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnableNetworkPolicy(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkPolicy: gke.NetworkPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -54,12 +54,12 @@ func TestCheckEnableNetworkPolicy(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkPolicy: gke.NetworkPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
-						EnableAutpilot: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						EnableAutpilot: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -70,12 +70,12 @@ func TestCheckEnableNetworkPolicy(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkPolicy: gke.NetworkPolicy{
-							Metadata: defsecTypes.NewTestMetadata(),
-							Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
-						DatapathProvider: defsecTypes.String("ADVANCED_DATAPATH", defsecTypes.NewTestMetadata()),
+						DatapathProvider: trivyTypes.String("ADVANCED_DATAPATH", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/gke/enable_private_cluster_test.go b/checks/cloud/google/gke/enable_private_cluster_test.go
index 5439858e..afbce4c6 100644
--- a/checks/cloud/google/gke/enable_private_cluster_test.go
+++ b/checks/cloud/google/gke/enable_private_cluster_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckEnablePrivateCluster(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PrivateCluster: gke.PrivateCluster{
-							Metadata:           defsecTypes.NewTestMetadata(),
-							EnablePrivateNodes: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:           trivyTypes.NewTestMetadata(),
+							EnablePrivateNodes: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckEnablePrivateCluster(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						PrivateCluster: gke.PrivateCluster{
-							Metadata:           defsecTypes.NewTestMetadata(),
-							EnablePrivateNodes: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:           trivyTypes.NewTestMetadata(),
+							EnablePrivateNodes: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/gke/enable_stackdriver_logging_test.go b/checks/cloud/google/gke/enable_stackdriver_logging_test.go
index 1c5c8287..47b13e3d 100644
--- a/checks/cloud/google/gke/enable_stackdriver_logging_test.go
+++ b/checks/cloud/google/gke/enable_stackdriver_logging_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableStackdriverLogging(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:       defsecTypes.NewTestMetadata(),
-						LoggingService: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:       trivyTypes.NewTestMetadata(),
+						LoggingService: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableStackdriverLogging(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:       defsecTypes.NewTestMetadata(),
-						LoggingService: defsecTypes.String("logging.googleapis.com/kubernetes", defsecTypes.NewTestMetadata()),
+						Metadata:       trivyTypes.NewTestMetadata(),
+						LoggingService: trivyTypes.String("logging.googleapis.com/kubernetes", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/gke/enable_stackdriver_monitoring_test.go b/checks/cloud/google/gke/enable_stackdriver_monitoring_test.go
index cdb26b6e..7f76a5b5 100644
--- a/checks/cloud/google/gke/enable_stackdriver_monitoring_test.go
+++ b/checks/cloud/google/gke/enable_stackdriver_monitoring_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableStackdriverMonitoring(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:          defsecTypes.NewTestMetadata(),
-						MonitoringService: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:          trivyTypes.NewTestMetadata(),
+						MonitoringService: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableStackdriverMonitoring(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:          defsecTypes.NewTestMetadata(),
-						MonitoringService: defsecTypes.String("monitoring.googleapis.com/kubernetes", defsecTypes.NewTestMetadata()),
+						Metadata:          trivyTypes.NewTestMetadata(),
+						MonitoringService: trivyTypes.String("monitoring.googleapis.com/kubernetes", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/gke/metadata_endpoints_disabled_test.go b/checks/cloud/google/gke/metadata_endpoints_disabled_test.go
index a201f246..7a25abf7 100644
--- a/checks/cloud/google/gke/metadata_endpoints_disabled_test.go
+++ b/checks/cloud/google/gke/metadata_endpoints_disabled_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckMetadataEndpointsDisabled(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata:              defsecTypes.NewTestMetadata(),
-							EnableLegacyEndpoints: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:              trivyTypes.NewTestMetadata(),
+							EnableLegacyEndpoints: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
-						RemoveDefaultNodePool: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						RemoveDefaultNodePool: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -40,12 +40,12 @@ func TestCheckMetadataEndpointsDisabled(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata:              defsecTypes.NewTestMetadata(),
-							EnableLegacyEndpoints: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+							Metadata:              trivyTypes.NewTestMetadata(),
+							EnableLegacyEndpoints: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						},
-						RemoveDefaultNodePool: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						RemoveDefaultNodePool: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -56,17 +56,17 @@ func TestCheckMetadataEndpointsDisabled(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata:              defsecTypes.NewTestMetadata(),
-							EnableLegacyEndpoints: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:              trivyTypes.NewTestMetadata(),
+							EnableLegacyEndpoints: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
-						RemoveDefaultNodePool: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						RemoveDefaultNodePool: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						NodePools: []gke.NodePool{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								NodeConfig: gke.NodeConfig{
-									EnableLegacyEndpoints: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+									EnableLegacyEndpoints: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -80,17 +80,17 @@ func TestCheckMetadataEndpointsDisabled(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata:              defsecTypes.NewTestMetadata(),
-							EnableLegacyEndpoints: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:              trivyTypes.NewTestMetadata(),
+							EnableLegacyEndpoints: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						},
-						RemoveDefaultNodePool: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						RemoveDefaultNodePool: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						NodePools: []gke.NodePool{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								NodeConfig: gke.NodeConfig{
-									EnableLegacyEndpoints: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+									EnableLegacyEndpoints: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/google/gke/no_legacy_authentication_test.go b/checks/cloud/google/gke/no_legacy_authentication_test.go
index 2f970de6..0f68f13b 100644
--- a/checks/cloud/google/gke/no_legacy_authentication_test.go
+++ b/checks/cloud/google/gke/no_legacy_authentication_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckNoLegacyAuthentication(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MasterAuth: gke.MasterAuth{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							ClientCertificate: gke.ClientCertificate{
-								Metadata:         defsecTypes.NewTestMetadata(),
-								IssueCertificate: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:         trivyTypes.NewTestMetadata(),
+								IssueCertificate: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,14 +42,14 @@ func TestCheckNoLegacyAuthentication(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MasterAuth: gke.MasterAuth{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							ClientCertificate: gke.ClientCertificate{
-								Metadata:         defsecTypes.NewTestMetadata(),
-								IssueCertificate: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:         trivyTypes.NewTestMetadata(),
+								IssueCertificate: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
-							Username: defsecTypes.String("username", defsecTypes.NewTestMetadata()),
+							Username: trivyTypes.String("username", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -61,14 +61,14 @@ func TestCheckNoLegacyAuthentication(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MasterAuth: gke.MasterAuth{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							ClientCertificate: gke.ClientCertificate{
-								Metadata:         defsecTypes.NewTestMetadata(),
-								IssueCertificate: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:         trivyTypes.NewTestMetadata(),
+								IssueCertificate: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
-							Username: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Username: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/gke/no_public_control_plane_test.go b/checks/cloud/google/gke/no_public_control_plane_test.go
index 7afd3526..a2f0954a 100644
--- a/checks/cloud/google/gke/no_public_control_plane_test.go
+++ b/checks/cloud/google/gke/no_public_control_plane_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckNoPublicControlPlane(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MasterAuthorizedNetworks: gke.MasterAuthorizedNetworks{
-							Metadata: defsecTypes.NewTestMetadata(),
-							CIDRs: []defsecTypes.StringValue{
-								defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							CIDRs: []trivyTypes.StringValue{
+								trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckNoPublicControlPlane(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						MasterAuthorizedNetworks: gke.MasterAuthorizedNetworks{
-							Metadata: defsecTypes.NewTestMetadata(),
-							CIDRs: []defsecTypes.StringValue{
-								defsecTypes.String("10.10.128.0/24", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							CIDRs: []trivyTypes.StringValue{
+								trivyTypes.String("10.10.128.0/24", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/gke/node_metadata_security_test.go b/checks/cloud/google/gke/node_metadata_security_test.go
index 451f3373..d11b9843 100644
--- a/checks/cloud/google/gke/node_metadata_security_test.go
+++ b/checks/cloud/google/gke/node_metadata_security_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckNodeMetadataSecurity(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							WorkloadMetadataConfig: gke.WorkloadMetadataConfig{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								NodeMetadata: defsecTypes.String("UNSPECIFIED", defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								NodeMetadata: trivyTypes.String("UNSPECIFIED", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,22 +42,22 @@ func TestCheckNodeMetadataSecurity(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							WorkloadMetadataConfig: gke.WorkloadMetadataConfig{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								NodeMetadata: defsecTypes.String("SECURE", defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								NodeMetadata: trivyTypes.String("SECURE", trivyTypes.NewTestMetadata()),
 							},
 						},
 						NodePools: []gke.NodePool{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								NodeConfig: gke.NodeConfig{
-									Metadata: defsecTypes.NewTestMetadata(),
+									Metadata: trivyTypes.NewTestMetadata(),
 									WorkloadMetadataConfig: gke.WorkloadMetadataConfig{
-										Metadata:     defsecTypes.NewTestMetadata(),
-										NodeMetadata: defsecTypes.String("EXPOSE", defsecTypes.NewTestMetadata()),
+										Metadata:     trivyTypes.NewTestMetadata(),
+										NodeMetadata: trivyTypes.String("EXPOSE", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -72,12 +72,12 @@ func TestCheckNodeMetadataSecurity(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							WorkloadMetadataConfig: gke.WorkloadMetadataConfig{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								NodeMetadata: defsecTypes.String("SECURE", defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								NodeMetadata: trivyTypes.String("SECURE", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/gke/node_pool_uses_cos_test.go b/checks/cloud/google/gke/node_pool_uses_cos_test.go
index 3aaea1aa..dc21d548 100644
--- a/checks/cloud/google/gke/node_pool_uses_cos_test.go
+++ b/checks/cloud/google/gke/node_pool_uses_cos_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckNodePoolUsesCos(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							ImageType: defsecTypes.String("UBUNTU", defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							ImageType: trivyTypes.String("UBUNTU", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,17 +39,17 @@ func TestCheckNodePoolUsesCos(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							ImageType: defsecTypes.String("COS", defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							ImageType: trivyTypes.String("COS", trivyTypes.NewTestMetadata()),
 						},
 						NodePools: []gke.NodePool{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								NodeConfig: gke.NodeConfig{
-									Metadata:  defsecTypes.NewTestMetadata(),
-									ImageType: defsecTypes.String("UBUNTU", defsecTypes.NewTestMetadata()),
+									Metadata:  trivyTypes.NewTestMetadata(),
+									ImageType: trivyTypes.String("UBUNTU", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -63,10 +63,10 @@ func TestCheckNodePoolUsesCos(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NodeConfig: gke.NodeConfig{
-							Metadata:  defsecTypes.NewTestMetadata(),
-							ImageType: defsecTypes.String("COS_CONTAINERD", defsecTypes.NewTestMetadata()),
+							Metadata:  trivyTypes.NewTestMetadata(),
+							ImageType: trivyTypes.String("COS_CONTAINERD", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/gke/node_shielding_enabled_test.go b/checks/cloud/google/gke/node_shielding_enabled_test.go
index 64ba8bff..bd978e2e 100644
--- a/checks/cloud/google/gke/node_shielding_enabled_test.go
+++ b/checks/cloud/google/gke/node_shielding_enabled_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNodeShieldingEnabled(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:            defsecTypes.NewTestMetadata(),
-						EnableShieldedNodes: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:            trivyTypes.NewTestMetadata(),
+						EnableShieldedNodes: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNodeShieldingEnabled(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:            defsecTypes.NewTestMetadata(),
-						EnableShieldedNodes: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:            trivyTypes.NewTestMetadata(),
+						EnableShieldedNodes: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/gke/use_cluster_labels_test.go b/checks/cloud/google/gke/use_cluster_labels_test.go
index a1d83aa3..d287357a 100644
--- a/checks/cloud/google/gke/use_cluster_labels_test.go
+++ b/checks/cloud/google/gke/use_cluster_labels_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckUseClusterLabels(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:       defsecTypes.NewTestMetadata(),
-						ResourceLabels: defsecTypes.Map(map[string]string{}, defsecTypes.NewTestMetadata().GetMetadata()),
+						Metadata:       trivyTypes.NewTestMetadata(),
+						ResourceLabels: trivyTypes.Map(map[string]string{}, trivyTypes.NewTestMetadata().GetMetadata()),
 					},
 				},
 			},
@@ -36,10 +36,10 @@ func TestCheckUseClusterLabels(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						ResourceLabels: defsecTypes.Map(map[string]string{
+						Metadata: trivyTypes.NewTestMetadata(),
+						ResourceLabels: trivyTypes.Map(map[string]string{
 							"env": "staging",
-						}, defsecTypes.NewTestMetadata().GetMetadata()),
+						}, trivyTypes.NewTestMetadata().GetMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/gke/use_rbac_permissions_test.go b/checks/cloud/google/gke/use_rbac_permissions_test.go
index 45c15c98..34915d51 100644
--- a/checks/cloud/google/gke/use_rbac_permissions_test.go
+++ b/checks/cloud/google/gke/use_rbac_permissions_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckUseRbacPermissions(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						EnableLegacyABAC: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						EnableLegacyABAC: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckUseRbacPermissions(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:         defsecTypes.NewTestMetadata(),
-						EnableLegacyABAC: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:         trivyTypes.NewTestMetadata(),
+						EnableLegacyABAC: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/gke/use_service_account_test.go b/checks/cloud/google/gke/use_service_account_test.go
index 9c8533e6..45ade30c 100644
--- a/checks/cloud/google/gke/use_service_account_test.go
+++ b/checks/cloud/google/gke/use_service_account_test.go
@@ -3,7 +3,7 @@ package gke
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckUseServiceAccount(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:              defsecTypes.NewTestMetadata(),
-						RemoveDefaultNodePool: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:              trivyTypes.NewTestMetadata(),
+						RemoveDefaultNodePool: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						NodeConfig: gke.NodeConfig{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							ServiceAccount: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							ServiceAccount: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -40,11 +40,11 @@ func TestCheckUseServiceAccount(t *testing.T) {
 			input: gke.GKE{
 				Clusters: []gke.Cluster{
 					{
-						Metadata:              defsecTypes.NewTestMetadata(),
-						RemoveDefaultNodePool: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:              trivyTypes.NewTestMetadata(),
+						RemoveDefaultNodePool: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						NodeConfig: gke.NodeConfig{
-							Metadata:       defsecTypes.NewTestMetadata(),
-							ServiceAccount: defsecTypes.String("service-account", defsecTypes.NewTestMetadata()),
+							Metadata:       trivyTypes.NewTestMetadata(),
+							ServiceAccount: trivyTypes.String("service-account", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider_test.go b/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider_test.go
index 97ff53e1..33e71cef 100644
--- a/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider_test.go
+++ b/checks/cloud/google/iam/no_conditions_on_workload_identity_pool_provider_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,9 +24,9 @@ func TestCheckNoConditionOnWorkloadIdentityPoolProvider(t *testing.T) {
 			input: iam.IAM{
 				WorkloadIdentityPoolProviders: []iam.WorkloadIdentityPoolProvider{
 					{
-						Metadata:                       defsecTypes.NewTestMetadata(),
-						WorkloadIdentityPoolId:         defsecTypes.String("example-pool", defsecTypes.NewTestMetadata()),
-						WorkloadIdentityPoolProviderId: defsecTypes.String("example-provider", defsecTypes.NewTestMetadata()),
+						Metadata:                       trivyTypes.NewTestMetadata(),
+						WorkloadIdentityPoolId:         trivyTypes.String("example-pool", trivyTypes.NewTestMetadata()),
+						WorkloadIdentityPoolProviderId: trivyTypes.String("example-provider", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -37,10 +37,10 @@ func TestCheckNoConditionOnWorkloadIdentityPoolProvider(t *testing.T) {
 			input: iam.IAM{
 				WorkloadIdentityPoolProviders: []iam.WorkloadIdentityPoolProvider{
 					{
-						Metadata:                       defsecTypes.NewTestMetadata(),
-						WorkloadIdentityPoolId:         defsecTypes.String("example-pool", defsecTypes.NewTestMetadata()),
-						WorkloadIdentityPoolProviderId: defsecTypes.String("example-provider", defsecTypes.NewTestMetadata()),
-						AttributeCondition:             defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:                       trivyTypes.NewTestMetadata(),
+						WorkloadIdentityPoolId:         trivyTypes.String("example-pool", trivyTypes.NewTestMetadata()),
+						WorkloadIdentityPoolProviderId: trivyTypes.String("example-provider", trivyTypes.NewTestMetadata()),
+						AttributeCondition:             trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -51,10 +51,10 @@ func TestCheckNoConditionOnWorkloadIdentityPoolProvider(t *testing.T) {
 			input: iam.IAM{
 				WorkloadIdentityPoolProviders: []iam.WorkloadIdentityPoolProvider{
 					{
-						Metadata:                       defsecTypes.NewTestMetadata(),
-						WorkloadIdentityPoolId:         defsecTypes.String("example-pool", defsecTypes.NewTestMetadata()),
-						WorkloadIdentityPoolProviderId: defsecTypes.String("example-provider", defsecTypes.NewTestMetadata()),
-						AttributeCondition:             defsecTypes.String("assertion.repository_owner=='your-github-organization'", defsecTypes.NewTestMetadata()),
+						Metadata:                       trivyTypes.NewTestMetadata(),
+						WorkloadIdentityPoolId:         trivyTypes.String("example-pool", trivyTypes.NewTestMetadata()),
+						WorkloadIdentityPoolProviderId: trivyTypes.String("example-provider", trivyTypes.NewTestMetadata()),
+						AttributeCondition:             trivyTypes.String("assertion.repository_owner=='your-github-organization'", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/iam/no_default_network_test.go b/checks/cloud/google/iam/no_default_network_test.go
index 29a9964b..d26581e8 100644
--- a/checks/cloud/google/iam/no_default_network_test.go
+++ b/checks/cloud/google/iam/no_default_network_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckNoDefaultNetwork(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Projects: []iam.Project{
 							{
-								Metadata:          defsecTypes.NewTestMetadata(),
-								AutoCreateNetwork: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:          trivyTypes.NewTestMetadata(),
+								AutoCreateNetwork: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,24 +41,24 @@ func TestCheckNoDefaultNetwork(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Projects: []iam.Project{
 									{
-										Metadata:          defsecTypes.NewTestMetadata(),
-										AutoCreateNetwork: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+										Metadata:          trivyTypes.NewTestMetadata(),
+										AutoCreateNetwork: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 									},
 								},
 								Folders: []iam.Folder{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 										Projects: []iam.Project{
 											{
-												Metadata:          defsecTypes.NewTestMetadata(),
-												AutoCreateNetwork: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+												Metadata:          trivyTypes.NewTestMetadata(),
+												AutoCreateNetwork: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 											},
 										},
 									},
@@ -75,11 +75,11 @@ func TestCheckNoDefaultNetwork(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Projects: []iam.Project{
 							{
-								Metadata:          defsecTypes.NewTestMetadata(),
-								AutoCreateNetwork: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:          trivyTypes.NewTestMetadata(),
+								AutoCreateNetwork: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/iam/no_folder_level_default_service_account_assignment_test.go b/checks/cloud/google/iam/no_folder_level_default_service_account_assignment_test.go
index dcb3f4f0..95249a39 100644
--- a/checks/cloud/google/iam/no_folder_level_default_service_account_assignment_test.go
+++ b/checks/cloud/google/iam/no_folder_level_default_service_account_assignment_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,16 +24,16 @@ func TestCheckNoFolderLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata:              defsecTypes.NewTestMetadata(),
-										DefaultServiceAccount: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-										Member:                defsecTypes.String("proper@email.com", defsecTypes.NewTestMetadata()),
+										Metadata:              trivyTypes.NewTestMetadata(),
+										DefaultServiceAccount: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+										Member:                trivyTypes.String("proper@email.com", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -48,15 +48,15 @@ func TestCheckNoFolderLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata:              defsecTypes.NewTestMetadata(),
-										DefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										Member:                defsecTypes.String("123-compute@developer.gserviceaccount.com", defsecTypes.NewTestMetadata()),
+										Metadata:              trivyTypes.NewTestMetadata(),
+										DefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										Member:                trivyTypes.String("123-compute@developer.gserviceaccount.com", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -71,17 +71,17 @@ func TestCheckNoFolderLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Bindings: []iam.Binding{
 									{
-										Metadata:                      defsecTypes.NewTestMetadata(),
-										IncludesDefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										Members: []defsecTypes.StringValue{
-											defsecTypes.String("123-compute@developer.gserviceaccount.com", defsecTypes.NewTestMetadata())},
+										Metadata:                      trivyTypes.NewTestMetadata(),
+										IncludesDefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										Members: []trivyTypes.StringValue{
+											trivyTypes.String("123-compute@developer.gserviceaccount.com", trivyTypes.NewTestMetadata())},
 									},
 								},
 							},
@@ -96,24 +96,24 @@ func TestCheckNoFolderLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata:              defsecTypes.NewTestMetadata(),
-										DefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										Member:                defsecTypes.String("proper@email.com", defsecTypes.NewTestMetadata()),
+										Metadata:              trivyTypes.NewTestMetadata(),
+										DefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										Member:                trivyTypes.String("proper@email.com", trivyTypes.NewTestMetadata()),
 									},
 								},
 								Bindings: []iam.Binding{
 									{
-										Metadata:                      defsecTypes.NewTestMetadata(),
-										IncludesDefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										Members: []defsecTypes.StringValue{
-											defsecTypes.String("proper@account.com", defsecTypes.NewTestMetadata()),
+										Metadata:                      trivyTypes.NewTestMetadata(),
+										IncludesDefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										Members: []trivyTypes.StringValue{
+											trivyTypes.String("proper@account.com", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
diff --git a/checks/cloud/google/iam/no_folder_level_service_account_impersonation_test.go b/checks/cloud/google/iam/no_folder_level_service_account_impersonation_test.go
index b11bd9ee..acfd1c53 100644
--- a/checks/cloud/google/iam/no_folder_level_service_account_impersonation_test.go
+++ b/checks/cloud/google/iam/no_folder_level_service_account_impersonation_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,14 +24,14 @@ func TestCheckNoFolderLevelServiceAccountImpersonation(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Role:     defsecTypes.String("roles/iam.serviceAccountUser", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Role:     trivyTypes.String("roles/iam.serviceAccountUser", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -46,15 +46,15 @@ func TestCheckNoFolderLevelServiceAccountImpersonation(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Bindings: []iam.Binding{
 									{
-										Metadata:                      defsecTypes.NewTestMetadata(),
-										IncludesDefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										Role:                          defsecTypes.String("roles/iam.serviceAccountTokenCreator", defsecTypes.NewTestMetadata()),
+										Metadata:                      trivyTypes.NewTestMetadata(),
+										IncludesDefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										Role:                          trivyTypes.String("roles/iam.serviceAccountTokenCreator", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -69,21 +69,21 @@ func TestCheckNoFolderLevelServiceAccountImpersonation(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Role:     defsecTypes.String("roles/nothingInParticular", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Role:     trivyTypes.String("roles/nothingInParticular", trivyTypes.NewTestMetadata()),
 									},
 								},
 								Bindings: []iam.Binding{
 									{
-										Metadata:                      defsecTypes.NewTestMetadata(),
-										IncludesDefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										Role:                          defsecTypes.String("roles/nothingInParticular", defsecTypes.NewTestMetadata()),
+										Metadata:                      trivyTypes.NewTestMetadata(),
+										IncludesDefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										Role:                          trivyTypes.String("roles/nothingInParticular", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/google/iam/no_org_level_default_service_account_assignment_test.go b/checks/cloud/google/iam/no_org_level_default_service_account_assignment_test.go
index bdbb215e..eb9362c9 100644
--- a/checks/cloud/google/iam/no_org_level_default_service_account_assignment_test.go
+++ b/checks/cloud/google/iam/no_org_level_default_service_account_assignment_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckNoOrgLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Bindings: []iam.Binding{
 							{
-								Metadata:                      defsecTypes.NewTestMetadata(),
-								IncludesDefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								Members: []defsecTypes.StringValue{
-									defsecTypes.String("123-compute@developer.gserviceaccount.com", defsecTypes.NewTestMetadata()),
+								Metadata:                      trivyTypes.NewTestMetadata(),
+								IncludesDefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								Members: []trivyTypes.StringValue{
+									trivyTypes.String("123-compute@developer.gserviceaccount.com", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -44,12 +44,12 @@ func TestCheckNoOrgLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Members: []iam.Member{
 							{
-								Metadata:              defsecTypes.NewTestMetadata(),
-								Member:                defsecTypes.String("proper@email.com", defsecTypes.NewTestMetadata()),
-								DefaultServiceAccount: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:              trivyTypes.NewTestMetadata(),
+								Member:                trivyTypes.String("proper@email.com", trivyTypes.NewTestMetadata()),
+								DefaultServiceAccount: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -62,20 +62,20 @@ func TestCheckNoOrgLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Members: []iam.Member{
 							{
-								Metadata:              defsecTypes.NewTestMetadata(),
-								Member:                defsecTypes.String("proper@email.com", defsecTypes.NewTestMetadata()),
-								DefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:              trivyTypes.NewTestMetadata(),
+								Member:                trivyTypes.String("proper@email.com", trivyTypes.NewTestMetadata()),
+								DefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 						Bindings: []iam.Binding{
 							{
-								Metadata:                      defsecTypes.NewTestMetadata(),
-								IncludesDefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								Members: []defsecTypes.StringValue{
-									defsecTypes.String("proper@email.com", defsecTypes.NewTestMetadata()),
+								Metadata:                      trivyTypes.NewTestMetadata(),
+								IncludesDefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								Members: []trivyTypes.StringValue{
+									trivyTypes.String("proper@email.com", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
diff --git a/checks/cloud/google/iam/no_org_level_service_account_impersonation_test.go b/checks/cloud/google/iam/no_org_level_service_account_impersonation_test.go
index deb0845f..817c6512 100644
--- a/checks/cloud/google/iam/no_org_level_service_account_impersonation_test.go
+++ b/checks/cloud/google/iam/no_org_level_service_account_impersonation_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckNoOrgLevelServiceAccountImpersonation(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Members: []iam.Member{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Role:     defsecTypes.String("roles/iam.serviceAccountUser", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Role:     trivyTypes.String("roles/iam.serviceAccountUser", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckNoOrgLevelServiceAccountImpersonation(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Bindings: []iam.Binding{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Role:     defsecTypes.String("roles/iam.serviceAccountTokenCreator", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Role:     trivyTypes.String("roles/iam.serviceAccountTokenCreator", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -59,17 +59,17 @@ func TestCheckNoOrgLevelServiceAccountImpersonation(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Members: []iam.Member{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Role:     defsecTypes.String("roles/some-custom-role", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Role:     trivyTypes.String("roles/some-custom-role", trivyTypes.NewTestMetadata()),
 							},
 						},
 						Bindings: []iam.Binding{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Role:     defsecTypes.String("roles/some-custom-role", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Role:     trivyTypes.String("roles/some-custom-role", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/iam/no_privileged_service_accounts_test.go b/checks/cloud/google/iam/no_privileged_service_accounts_test.go
index f6b9c5b8..bda7066b 100644
--- a/checks/cloud/google/iam/no_privileged_service_accounts_test.go
+++ b/checks/cloud/google/iam/no_privileged_service_accounts_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckNoPrivilegedServiceAccounts(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Members: []iam.Member{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Role:     defsecTypes.String("roles/owner", defsecTypes.NewTestMetadata()),
-								Member:   defsecTypes.String("serviceAccount:${google_service_account.test.email}", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Role:     trivyTypes.String("roles/owner", trivyTypes.NewTestMetadata()),
+								Member:   trivyTypes.String("serviceAccount:${google_service_account.test.email}", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,19 +42,19 @@ func TestCheckNoPrivilegedServiceAccounts(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Projects: []iam.Project{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 										Bindings: []iam.Binding{
 											{
-												Metadata: defsecTypes.NewTestMetadata(),
-												Role:     defsecTypes.String("roles/editor", defsecTypes.NewTestMetadata()),
-												Members: []defsecTypes.StringValue{
-													defsecTypes.String("serviceAccount:${google_service_account.test.email}", defsecTypes.NewTestMetadata()),
+												Metadata: trivyTypes.NewTestMetadata(),
+												Role:     trivyTypes.String("roles/editor", trivyTypes.NewTestMetadata()),
+												Members: []trivyTypes.StringValue{
+													trivyTypes.String("serviceAccount:${google_service_account.test.email}", trivyTypes.NewTestMetadata()),
 												},
 											},
 										},
@@ -72,26 +72,26 @@ func TestCheckNoPrivilegedServiceAccounts(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Projects: []iam.Project{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
+										Metadata: trivyTypes.NewTestMetadata(),
 										Members: []iam.Member{
 											{
-												Metadata: defsecTypes.NewTestMetadata(),
-												Role:     defsecTypes.String("roles/owner", defsecTypes.NewTestMetadata()),
-												Member:   defsecTypes.String("proper@email.com", defsecTypes.NewTestMetadata()),
+												Metadata: trivyTypes.NewTestMetadata(),
+												Role:     trivyTypes.String("roles/owner", trivyTypes.NewTestMetadata()),
+												Member:   trivyTypes.String("proper@email.com", trivyTypes.NewTestMetadata()),
 											},
 										},
 										Bindings: []iam.Binding{
 											{
-												Metadata: defsecTypes.NewTestMetadata(),
-												Role:     defsecTypes.String("roles/logging.logWriter", defsecTypes.NewTestMetadata()),
-												Members: []defsecTypes.StringValue{
-													defsecTypes.String("serviceAccount:${google_service_account.test.email}", defsecTypes.NewTestMetadata()),
+												Metadata: trivyTypes.NewTestMetadata(),
+												Role:     trivyTypes.String("roles/logging.logWriter", trivyTypes.NewTestMetadata()),
+												Members: []trivyTypes.StringValue{
+													trivyTypes.String("serviceAccount:${google_service_account.test.email}", trivyTypes.NewTestMetadata()),
 												},
 											},
 										},
diff --git a/checks/cloud/google/iam/no_project_level_default_service_account_assignment_test.go b/checks/cloud/google/iam/no_project_level_default_service_account_assignment_test.go
index ef0bb2bb..6ba83d01 100644
--- a/checks/cloud/google/iam/no_project_level_default_service_account_assignment_test.go
+++ b/checks/cloud/google/iam/no_project_level_default_service_account_assignment_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,15 +24,15 @@ func TestCheckNoProjectLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Projects: []iam.Project{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata:              defsecTypes.NewTestMetadata(),
-										DefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										Member:                defsecTypes.String("123-compute@developer.gserviceaccount.com", defsecTypes.NewTestMetadata()),
+										Metadata:              trivyTypes.NewTestMetadata(),
+										DefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										Member:                trivyTypes.String("123-compute@developer.gserviceaccount.com", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -47,14 +47,14 @@ func TestCheckNoProjectLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Projects: []iam.Project{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Bindings: []iam.Binding{
 									{
-										Metadata:                      defsecTypes.NewTestMetadata(),
-										IncludesDefaultServiceAccount: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+										Metadata:                      trivyTypes.NewTestMetadata(),
+										IncludesDefaultServiceAccount: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -69,23 +69,23 @@ func TestCheckNoProjectLevelDefaultServiceAccountAssignment(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Projects: []iam.Project{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata:              defsecTypes.NewTestMetadata(),
-										DefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										Member:                defsecTypes.String("proper@email.com", defsecTypes.NewTestMetadata()),
+										Metadata:              trivyTypes.NewTestMetadata(),
+										DefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										Member:                trivyTypes.String("proper@email.com", trivyTypes.NewTestMetadata()),
 									},
 								},
 								Bindings: []iam.Binding{
 									{
-										Metadata:                      defsecTypes.NewTestMetadata(),
-										IncludesDefaultServiceAccount: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-										Members: []defsecTypes.StringValue{
-											defsecTypes.String("proper@email.com", defsecTypes.NewTestMetadata()),
+										Metadata:                      trivyTypes.NewTestMetadata(),
+										IncludesDefaultServiceAccount: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+										Members: []trivyTypes.StringValue{
+											trivyTypes.String("proper@email.com", trivyTypes.NewTestMetadata()),
 										},
 									},
 								},
diff --git a/checks/cloud/google/iam/no_project_level_service_account_impersonation_test.go b/checks/cloud/google/iam/no_project_level_service_account_impersonation_test.go
index 78924a8a..746b0a33 100644
--- a/checks/cloud/google/iam/no_project_level_service_account_impersonation_test.go
+++ b/checks/cloud/google/iam/no_project_level_service_account_impersonation_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,14 +24,14 @@ func TestCheckNoProjectLevelServiceAccountImpersonation(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Projects: []iam.Project{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Role:     defsecTypes.String("roles/iam.serviceAccountUser", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Role:     trivyTypes.String("roles/iam.serviceAccountUser", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -46,14 +46,14 @@ func TestCheckNoProjectLevelServiceAccountImpersonation(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Projects: []iam.Project{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Bindings: []iam.Binding{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Role:     defsecTypes.String("roles/iam.serviceAccountTokenCreator", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Role:     trivyTypes.String("roles/iam.serviceAccountTokenCreator", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -68,20 +68,20 @@ func TestCheckNoProjectLevelServiceAccountImpersonation(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Projects: []iam.Project{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Role:     defsecTypes.String("roles/specific-role", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Role:     trivyTypes.String("roles/specific-role", trivyTypes.NewTestMetadata()),
 									},
 								},
 								Bindings: []iam.Binding{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Role:     defsecTypes.String("roles/specific-role", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Role:     trivyTypes.String("roles/specific-role", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/google/iam/no_user_granted_permissions_test.go b/checks/cloud/google/iam/no_user_granted_permissions_test.go
index 5ec24224..28eb24cb 100644
--- a/checks/cloud/google/iam/no_user_granted_permissions_test.go
+++ b/checks/cloud/google/iam/no_user_granted_permissions_test.go
@@ -3,7 +3,7 @@ package iam
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,24 +24,24 @@ func TestCheckNoUserGrantedPermissions(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Projects: []iam.Project{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Member:   defsecTypes.String("user:test@example.com", defsecTypes.NewTestMetadata()),
-										Role:     defsecTypes.String("some-role", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Member:   trivyTypes.String("user:test@example.com", trivyTypes.NewTestMetadata()),
+										Role:     trivyTypes.String("some-role", trivyTypes.NewTestMetadata()),
 									},
 								},
 								Bindings: []iam.Binding{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Members: []defsecTypes.StringValue{
-											defsecTypes.String("user:test@example.com", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Members: []trivyTypes.StringValue{
+											trivyTypes.String("user:test@example.com", trivyTypes.NewTestMetadata()),
 										},
-										Role: defsecTypes.String("some-role", defsecTypes.NewTestMetadata()),
+										Role: trivyTypes.String("some-role", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -56,12 +56,12 @@ func TestCheckNoUserGrantedPermissions(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Members: []iam.Member{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Member:   defsecTypes.String("user:test@example.com", defsecTypes.NewTestMetadata()),
-								Role:     defsecTypes.String("some-role", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Member:   trivyTypes.String("user:test@example.com", trivyTypes.NewTestMetadata()),
+								Role:     trivyTypes.String("some-role", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -74,15 +74,15 @@ func TestCheckNoUserGrantedPermissions(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Members: []iam.Member{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Member:   defsecTypes.String("user:test@example.com", defsecTypes.NewTestMetadata()),
-										Role:     defsecTypes.String("some-role", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Member:   trivyTypes.String("user:test@example.com", trivyTypes.NewTestMetadata()),
+										Role:     trivyTypes.String("some-role", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -97,17 +97,17 @@ func TestCheckNoUserGrantedPermissions(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Bindings: []iam.Binding{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Members: []defsecTypes.StringValue{
-											defsecTypes.String("user:test@example.com", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Members: []trivyTypes.StringValue{
+											trivyTypes.String("user:test@example.com", trivyTypes.NewTestMetadata()),
 										},
-										Role: defsecTypes.String("some-role", defsecTypes.NewTestMetadata()),
+										Role: trivyTypes.String("some-role", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -122,33 +122,33 @@ func TestCheckNoUserGrantedPermissions(t *testing.T) {
 			input: iam.IAM{
 				Organizations: []iam.Organization{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Members: []iam.Member{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Member:   defsecTypes.String("group:test@example.com", defsecTypes.NewTestMetadata()),
-								Role:     defsecTypes.String("some-role", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Member:   trivyTypes.String("group:test@example.com", trivyTypes.NewTestMetadata()),
+								Role:     trivyTypes.String("some-role", trivyTypes.NewTestMetadata()),
 							},
 						},
 						Bindings: []iam.Binding{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Members: []defsecTypes.StringValue{
-									defsecTypes.String("group:test@example.com", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Members: []trivyTypes.StringValue{
+									trivyTypes.String("group:test@example.com", trivyTypes.NewTestMetadata()),
 								},
-								Role: defsecTypes.String("some-role", defsecTypes.NewTestMetadata()),
+								Role: trivyTypes.String("some-role", trivyTypes.NewTestMetadata()),
 							},
 						},
 						Folders: []iam.Folder{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
+								Metadata: trivyTypes.NewTestMetadata(),
 								Bindings: []iam.Binding{
 									{
-										Metadata: defsecTypes.NewTestMetadata(),
-										Members: []defsecTypes.StringValue{
-											defsecTypes.String("group:test@example.com", defsecTypes.NewTestMetadata()),
+										Metadata: trivyTypes.NewTestMetadata(),
+										Members: []trivyTypes.StringValue{
+											trivyTypes.String("group:test@example.com", trivyTypes.NewTestMetadata()),
 										},
-										Role: defsecTypes.String("some-role", defsecTypes.NewTestMetadata()),
+										Role: trivyTypes.String("some-role", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/google/kms/rotate_kms_keys_test.go b/checks/cloud/google/kms/rotate_kms_keys_test.go
index 7a69b9fd..b56ff23b 100644
--- a/checks/cloud/google/kms/rotate_kms_keys_test.go
+++ b/checks/cloud/google/kms/rotate_kms_keys_test.go
@@ -3,7 +3,7 @@ package kms
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckRotateKmsKeys(t *testing.T) {
 			input: kms.KMS{
 				KeyRings: []kms.KeyRing{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Keys: []kms.Key{
 							{
-								Metadata:              defsecTypes.NewTestMetadata(),
-								RotationPeriodSeconds: defsecTypes.Int(7862400, defsecTypes.NewTestMetadata()),
+								Metadata:              trivyTypes.NewTestMetadata(),
+								RotationPeriodSeconds: trivyTypes.Int(7862400, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckRotateKmsKeys(t *testing.T) {
 			input: kms.KMS{
 				KeyRings: []kms.KeyRing{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Keys: []kms.Key{
 							{
-								Metadata:              defsecTypes.NewTestMetadata(),
-								RotationPeriodSeconds: defsecTypes.Int(2592000, defsecTypes.NewTestMetadata()),
+								Metadata:              trivyTypes.NewTestMetadata(),
+								RotationPeriodSeconds: trivyTypes.Int(2592000, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/enable_backup_test.go b/checks/cloud/google/sql/enable_backup_test.go
index f60d05ce..62480548 100644
--- a/checks/cloud/google/sql/enable_backup_test.go
+++ b/checks/cloud/google/sql/enable_backup_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckEnableBackup(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						IsReplica: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						IsReplica: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Backups: sql.Backups{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckEnableBackup(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						IsReplica: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						IsReplica: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Backups: sql.Backups{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -62,13 +62,13 @@ func TestCheckEnableBackup(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						IsReplica: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						IsReplica: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Backups: sql.Backups{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Enabled:  defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Enabled:  trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/enable_pg_temp_file_logging_test.go b/checks/cloud/google/sql/enable_pg_temp_file_logging_test.go
index 251a5dae..bdfa8d31 100644
--- a/checks/cloud/google/sql/enable_pg_temp_file_logging_test.go
+++ b/checks/cloud/google/sql/enable_pg_temp_file_logging_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckEnablePgTempFileLogging(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:        defsecTypes.NewTestMetadata(),
-								LogTempFileSize: defsecTypes.Int(-1, defsecTypes.NewTestMetadata()),
+								Metadata:        trivyTypes.NewTestMetadata(),
+								LogTempFileSize: trivyTypes.Int(-1, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckEnablePgTempFileLogging(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:        defsecTypes.NewTestMetadata(),
-								LogTempFileSize: defsecTypes.Int(100, defsecTypes.NewTestMetadata()),
+								Metadata:        trivyTypes.NewTestMetadata(),
+								LogTempFileSize: trivyTypes.Int(100, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -62,13 +62,13 @@ func TestCheckEnablePgTempFileLogging(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:        defsecTypes.NewTestMetadata(),
-								LogTempFileSize: defsecTypes.Int(0, defsecTypes.NewTestMetadata()),
+								Metadata:        trivyTypes.NewTestMetadata(),
+								LogTempFileSize: trivyTypes.Int(0, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/encrypt_in_transit_data_test.go b/checks/cloud/google/sql/encrypt_in_transit_data_test.go
index bf91dd6d..19705bdf 100644
--- a/checks/cloud/google/sql/encrypt_in_transit_data_test.go
+++ b/checks/cloud/google/sql/encrypt_in_transit_data_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckEncryptInTransitData(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							IPConfiguration: sql.IPConfiguration{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								RequireTLS: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:   trivyTypes.NewTestMetadata(),
+								RequireTLS: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,12 +42,12 @@ func TestCheckEncryptInTransitData(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							IPConfiguration: sql.IPConfiguration{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								RequireTLS: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:   trivyTypes.NewTestMetadata(),
+								RequireTLS: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/mysql_no_local_infile_test.go b/checks/cloud/google/sql/mysql_no_local_infile_test.go
index e86ebfee..b276f21c 100644
--- a/checks/cloud/google/sql/mysql_no_local_infile_test.go
+++ b/checks/cloud/google/sql/mysql_no_local_infile_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckMysqlNoLocalInfile(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("MYSQL_5_6", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("MYSQL_5_6", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								LocalInFile: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								LocalInFile: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckMysqlNoLocalInfile(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("MYSQL_5_6", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("MYSQL_5_6", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								LocalInFile: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								LocalInFile: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/no_contained_db_auth_test.go b/checks/cloud/google/sql/no_contained_db_auth_test.go
index c868a0d8..0b6ca869 100644
--- a/checks/cloud/google/sql/no_contained_db_auth_test.go
+++ b/checks/cloud/google/sql/no_contained_db_auth_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckNoContainedDbAuth(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("SQLSERVER_2017_STANDARD", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("SQLSERVER_2017_STANDARD", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:                        defsecTypes.NewTestMetadata(),
-								ContainedDatabaseAuthentication: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:                        trivyTypes.NewTestMetadata(),
+								ContainedDatabaseAuthentication: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckNoContainedDbAuth(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("SQLSERVER_2017_STANDARD", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("SQLSERVER_2017_STANDARD", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:                        defsecTypes.NewTestMetadata(),
-								ContainedDatabaseAuthentication: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:                        trivyTypes.NewTestMetadata(),
+								ContainedDatabaseAuthentication: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/no_cross_db_ownership_chaining_test.go b/checks/cloud/google/sql/no_cross_db_ownership_chaining_test.go
index 4374bb20..54634558 100644
--- a/checks/cloud/google/sql/no_cross_db_ownership_chaining_test.go
+++ b/checks/cloud/google/sql/no_cross_db_ownership_chaining_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckNoCrossDbOwnershipChaining(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("SQLSERVER_2017_STANDARD", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("SQLSERVER_2017_STANDARD", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:                 defsecTypes.NewTestMetadata(),
-								CrossDBOwnershipChaining: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:                 trivyTypes.NewTestMetadata(),
+								CrossDBOwnershipChaining: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckNoCrossDbOwnershipChaining(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("SQLSERVER_2017_STANDARD", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("SQLSERVER_2017_STANDARD", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:                 defsecTypes.NewTestMetadata(),
-								CrossDBOwnershipChaining: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:                 trivyTypes.NewTestMetadata(),
+								CrossDBOwnershipChaining: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/no_public_access_test.go b/checks/cloud/google/sql/no_public_access_test.go
index 8718db56..1416bc22 100644
--- a/checks/cloud/google/sql/no_public_access_test.go
+++ b/checks/cloud/google/sql/no_public_access_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							IPConfiguration: sql.IPConfiguration{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								EnableIPv4: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:   trivyTypes.NewTestMetadata(),
+								EnableIPv4: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,18 +42,18 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							IPConfiguration: sql.IPConfiguration{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								EnableIPv4: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:   trivyTypes.NewTestMetadata(),
+								EnableIPv4: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								AuthorizedNetworks: []struct {
-									Name defsecTypes.StringValue
-									CIDR defsecTypes.StringValue
+									Name trivyTypes.StringValue
+									CIDR trivyTypes.StringValue
 								}{
 									{
-										CIDR: defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+										CIDR: trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
@@ -68,18 +68,18 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							IPConfiguration: sql.IPConfiguration{
-								Metadata:   defsecTypes.NewTestMetadata(),
-								EnableIPv4: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:   trivyTypes.NewTestMetadata(),
+								EnableIPv4: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 								AuthorizedNetworks: []struct {
-									Name defsecTypes.StringValue
-									CIDR defsecTypes.StringValue
+									Name trivyTypes.StringValue
+									CIDR trivyTypes.StringValue
 								}{
 									{
-										CIDR: defsecTypes.String("10.0.0.1/24", defsecTypes.NewTestMetadata()),
+										CIDR: trivyTypes.String("10.0.0.1/24", trivyTypes.NewTestMetadata()),
 									},
 								},
 							},
diff --git a/checks/cloud/google/sql/pg_log_checkpoints_test.go b/checks/cloud/google/sql/pg_log_checkpoints_test.go
index ea6a9a7e..167ca621 100644
--- a/checks/cloud/google/sql/pg_log_checkpoints_test.go
+++ b/checks/cloud/google/sql/pg_log_checkpoints_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckPgLogCheckpoints(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								LogCheckpoints: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								LogCheckpoints: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckPgLogCheckpoints(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								LogCheckpoints: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								LogCheckpoints: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/pg_log_connections_test.go b/checks/cloud/google/sql/pg_log_connections_test.go
index a0ad1f73..24ba0789 100644
--- a/checks/cloud/google/sql/pg_log_connections_test.go
+++ b/checks/cloud/google/sql/pg_log_connections_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckPgLogConnections(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								LogConnections: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								LogConnections: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckPgLogConnections(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								LogConnections: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								LogConnections: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/pg_log_disconnections_test.go b/checks/cloud/google/sql/pg_log_disconnections_test.go
index 0152e4cd..9c2b8c10 100644
--- a/checks/cloud/google/sql/pg_log_disconnections_test.go
+++ b/checks/cloud/google/sql/pg_log_disconnections_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckPgLogDisconnections(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:          defsecTypes.NewTestMetadata(),
-								LogDisconnections: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:          trivyTypes.NewTestMetadata(),
+								LogDisconnections: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckPgLogDisconnections(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:          defsecTypes.NewTestMetadata(),
-								LogDisconnections: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:          trivyTypes.NewTestMetadata(),
+								LogDisconnections: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/pg_log_errors_test.go b/checks/cloud/google/sql/pg_log_errors_test.go
index 51e7351f..1333a44f 100644
--- a/checks/cloud/google/sql/pg_log_errors_test.go
+++ b/checks/cloud/google/sql/pg_log_errors_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckPgLogErrors(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								LogMinMessages: defsecTypes.String("PANIC", defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								LogMinMessages: trivyTypes.String("PANIC", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckPgLogErrors(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:       defsecTypes.NewTestMetadata(),
-								LogMinMessages: defsecTypes.String("ERROR", defsecTypes.NewTestMetadata()),
+								Metadata:       trivyTypes.NewTestMetadata(),
+								LogMinMessages: trivyTypes.String("ERROR", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/pg_log_lock_waits_test.go b/checks/cloud/google/sql/pg_log_lock_waits_test.go
index 429d0e2d..00193f3c 100644
--- a/checks/cloud/google/sql/pg_log_lock_waits_test.go
+++ b/checks/cloud/google/sql/pg_log_lock_waits_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckPgLogLockWaits(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								LogLockWaits: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								LogLockWaits: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckPgLogLockWaits(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:     defsecTypes.NewTestMetadata(),
-								LogLockWaits: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+								Metadata:     trivyTypes.NewTestMetadata(),
+								LogLockWaits: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/sql/pg_no_min_statement_logging_test.go b/checks/cloud/google/sql/pg_no_min_statement_logging_test.go
index 6930835d..0ba4ee11 100644
--- a/checks/cloud/google/sql/pg_no_min_statement_logging_test.go
+++ b/checks/cloud/google/sql/pg_no_min_statement_logging_test.go
@@ -3,7 +3,7 @@ package sql
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,13 +24,13 @@ func TestCheckPgNoMinStatementLogging(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:                defsecTypes.NewTestMetadata(),
-								LogMinDurationStatement: defsecTypes.Int(0, defsecTypes.NewTestMetadata()),
+								Metadata:                trivyTypes.NewTestMetadata(),
+								LogMinDurationStatement: trivyTypes.Int(0, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -43,13 +43,13 @@ func TestCheckPgNoMinStatementLogging(t *testing.T) {
 			input: sql.SQL{
 				Instances: []sql.DatabaseInstance{
 					{
-						Metadata:        defsecTypes.NewTestMetadata(),
-						DatabaseVersion: defsecTypes.String("POSTGRES_12", defsecTypes.NewTestMetadata()),
+						Metadata:        trivyTypes.NewTestMetadata(),
+						DatabaseVersion: trivyTypes.String("POSTGRES_12", trivyTypes.NewTestMetadata()),
 						Settings: sql.Settings{
-							Metadata: defsecTypes.NewTestMetadata(),
+							Metadata: trivyTypes.NewTestMetadata(),
 							Flags: sql.Flags{
-								Metadata:                defsecTypes.NewTestMetadata(),
-								LogMinDurationStatement: defsecTypes.Int(-1, defsecTypes.NewTestMetadata()),
+								Metadata:                trivyTypes.NewTestMetadata(),
+								LogMinDurationStatement: trivyTypes.Int(-1, trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/google/storage/bucket_encryption_customer_test.go b/checks/cloud/google/storage/bucket_encryption_customer_test.go
index c0bb54f2..e988f547 100644
--- a/checks/cloud/google/storage/bucket_encryption_customer_test.go
+++ b/checks/cloud/google/storage/bucket_encryption_customer_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,10 +24,10 @@ func TestCheckBucketEncryptionCustomerKey(t *testing.T) {
 			input: storage.Storage{
 				Buckets: []storage.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: storage.BucketEncryption{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							DefaultKMSKeyName: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							DefaultKMSKeyName: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -39,10 +39,10 @@ func TestCheckBucketEncryptionCustomerKey(t *testing.T) {
 			input: storage.Storage{
 				Buckets: []storage.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Encryption: storage.BucketEncryption{
-							Metadata:          defsecTypes.NewTestMetadata(),
-							DefaultKMSKeyName: defsecTypes.String("default-kms-key-name", defsecTypes.NewTestMetadata()),
+							Metadata:          trivyTypes.NewTestMetadata(),
+							DefaultKMSKeyName: trivyTypes.String("default-kms-key-name", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/google/storage/enable_ubla_test.go b/checks/cloud/google/storage/enable_ubla_test.go
index 3885dbe5..31854d21 100644
--- a/checks/cloud/google/storage/enable_ubla_test.go
+++ b/checks/cloud/google/storage/enable_ubla_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckEnableUbla(t *testing.T) {
 			input: storage.Storage{
 				Buckets: []storage.Bucket{
 					{
-						Metadata:                       defsecTypes.NewTestMetadata(),
-						EnableUniformBucketLevelAccess: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:                       trivyTypes.NewTestMetadata(),
+						EnableUniformBucketLevelAccess: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckEnableUbla(t *testing.T) {
 			input: storage.Storage{
 				Buckets: []storage.Bucket{
 					{
-						Metadata:                       defsecTypes.NewTestMetadata(),
-						EnableUniformBucketLevelAccess: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:                       trivyTypes.NewTestMetadata(),
+						EnableUniformBucketLevelAccess: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/google/storage/no_public_access_test.go b/checks/cloud/google/storage/no_public_access_test.go
index 261ffdba..22ec3820 100644
--- a/checks/cloud/google/storage/no_public_access_test.go
+++ b/checks/cloud/google/storage/no_public_access_test.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,12 +25,12 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: storage.Storage{
 				Buckets: []storage.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Bindings: []iam.Binding{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Members: []defsecTypes.StringValue{
-									defsecTypes.String("allAuthenticatedUsers", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Members: []trivyTypes.StringValue{
+									trivyTypes.String("allAuthenticatedUsers", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
@@ -44,11 +44,11 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: storage.Storage{
 				Buckets: []storage.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Members: []iam.Member{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Member:   defsecTypes.String("allUsers", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Member:   trivyTypes.String("allUsers", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -61,19 +61,19 @@ func TestCheckNoPublicAccess(t *testing.T) {
 			input: storage.Storage{
 				Buckets: []storage.Bucket{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Bindings: []iam.Binding{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Members: []defsecTypes.StringValue{
-									defsecTypes.String("user:jane@example.com", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Members: []trivyTypes.StringValue{
+									trivyTypes.String("user:jane@example.com", trivyTypes.NewTestMetadata()),
 								},
 							},
 						},
 						Members: []iam.Member{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Member:   defsecTypes.String("user:john@example.com", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Member:   trivyTypes.String("user:john@example.com", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/nifcloud/computing/add_description_to_security_group_rule_test.go b/checks/cloud/nifcloud/computing/add_description_to_security_group_rule_test.go
index 6238f7a8..ca7aefd3 100644
--- a/checks/cloud/nifcloud/computing/add_description_to_security_group_rule_test.go
+++ b/checks/cloud/nifcloud/computing/add_description_to_security_group_rule_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,11 +24,11 @@ func TestCheckAddDescriptionToSecurityGroupRule(t *testing.T) {
 			input: computing.Computing{
 				SecurityGroups: []computing.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IngressRules: []computing.SecurityGroupRule{
 							{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								Description: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								Description: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckAddDescriptionToSecurityGroupRule(t *testing.T) {
 			input: computing.Computing{
 				SecurityGroups: []computing.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IngressRules: []computing.SecurityGroupRule{
 							{
-								Metadata:    defsecTypes.NewTestMetadata(),
-								Description: defsecTypes.String("some description", defsecTypes.NewTestMetadata()),
+								Metadata:    trivyTypes.NewTestMetadata(),
+								Description: trivyTypes.String("some description", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/nifcloud/computing/add_description_to_security_group_test.go b/checks/cloud/nifcloud/computing/add_description_to_security_group_test.go
index 6541c7b7..a24b6e44 100644
--- a/checks/cloud/nifcloud/computing/add_description_to_security_group_test.go
+++ b/checks/cloud/nifcloud/computing/add_description_to_security_group_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAddDescriptionToSecurityGroup(t *testing.T) {
 			input: computing.Computing{
 				SecurityGroups: []computing.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAddDescriptionToSecurityGroup(t *testing.T) {
 			input: computing.Computing{
 				SecurityGroups: []computing.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("Managed by Terraform", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("Managed by Terraform", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -48,8 +48,8 @@ func TestCheckAddDescriptionToSecurityGroup(t *testing.T) {
 			input: computing.Computing{
 				SecurityGroups: []computing.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("some proper description", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("some proper description", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/computing/add_security_group_to_instance_test.go b/checks/cloud/nifcloud/computing/add_security_group_to_instance_test.go
index 10ba4957..ca9dd21b 100644
--- a/checks/cloud/nifcloud/computing/add_security_group_to_instance_test.go
+++ b/checks/cloud/nifcloud/computing/add_security_group_to_instance_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAddSecurityGroupToInstance(t *testing.T) {
 			input: computing.Computing{
 				Instances: []computing.Instance{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						SecurityGroup: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						SecurityGroup: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAddSecurityGroupToInstance(t *testing.T) {
 			input: computing.Computing{
 				Instances: []computing.Instance{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						SecurityGroup: defsecTypes.String("some security group", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						SecurityGroup: trivyTypes.String("some security group", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/computing/no_common_private_instance_test.go b/checks/cloud/nifcloud/computing/no_common_private_instance_test.go
index af0ebfcb..6c4a9ad6 100644
--- a/checks/cloud/nifcloud/computing/no_common_private_instance_test.go
+++ b/checks/cloud/nifcloud/computing/no_common_private_instance_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
@@ -24,11 +24,11 @@ func TestCheckNoCommonPrivateInstance(t *testing.T) {
 			input: computing.Computing{
 				Instances: []computing.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []computing.NetworkInterface{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								NetworkID: defsecTypes.String("net-COMMON_PRIVATE", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								NetworkID: trivyTypes.String("net-COMMON_PRIVATE", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckNoCommonPrivateInstance(t *testing.T) {
 			input: computing.Computing{
 				Instances: []computing.Instance{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []computing.NetworkInterface{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								NetworkID: defsecTypes.String("net-some-private-lan", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								NetworkID: trivyTypes.String("net-some-private-lan", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/nifcloud/computing/no_public_ingress_sgr_test.go b/checks/cloud/nifcloud/computing/no_public_ingress_sgr_test.go
index 3af4bad6..25d2dbd5 100644
--- a/checks/cloud/nifcloud/computing/no_public_ingress_sgr_test.go
+++ b/checks/cloud/nifcloud/computing/no_public_ingress_sgr_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
@@ -24,11 +24,11 @@ func TestCheckNoPublicIngressSgr(t *testing.T) {
 			input: computing.Computing{
 				SecurityGroups: []computing.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IngressRules: []computing.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								CIDR:     defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								CIDR:     trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckNoPublicIngressSgr(t *testing.T) {
 			input: computing.Computing{
 				SecurityGroups: []computing.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						IngressRules: []computing.SecurityGroupRule{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								CIDR:     defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								CIDR:     trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/nifcloud/dns/remove_verified_record_test.go b/checks/cloud/nifcloud/dns/remove_verified_record_test.go
index b7f20fd5..0d089c85 100644
--- a/checks/cloud/nifcloud/dns/remove_verified_record_test.go
+++ b/checks/cloud/nifcloud/dns/remove_verified_record_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/dns"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -26,9 +26,9 @@ func TestCheckRemoveVerifiedRecord(t *testing.T) {
 			input: dns.DNS{
 				Records: []dns.Record{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String("A", defsecTypes.NewTestMetadata()),
-						Record:   defsecTypes.String("some", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String("A", trivyTypes.NewTestMetadata()),
+						Record:   trivyTypes.String("some", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -39,9 +39,9 @@ func TestCheckRemoveVerifiedRecord(t *testing.T) {
 			input: dns.DNS{
 				Records: []dns.Record{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String("TXT", defsecTypes.NewTestMetadata()),
-						Record:   defsecTypes.String("some", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String("TXT", trivyTypes.NewTestMetadata()),
+						Record:   trivyTypes.String("some", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -53,9 +53,9 @@ func TestCheckRemoveVerifiedRecord(t *testing.T) {
 			input: dns.DNS{
 				Records: []dns.Record{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Type:     defsecTypes.String("TXT", defsecTypes.NewTestMetadata()),
-						Record:   defsecTypes.String(dns.ZoneRegistrationAuthTxt, defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Type:     trivyTypes.String("TXT", trivyTypes.NewTestMetadata()),
+						Record:   trivyTypes.String(dns.ZoneRegistrationAuthTxt, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/nas/add_description_to_nas_security_group_test.go b/checks/cloud/nifcloud/nas/add_description_to_nas_security_group_test.go
index cf2db5e7..bbc628ae 100644
--- a/checks/cloud/nifcloud/nas/add_description_to_nas_security_group_test.go
+++ b/checks/cloud/nifcloud/nas/add_description_to_nas_security_group_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/nas"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAddDescriptionToNASSecurityGroup(t *testing.T) {
 			input: nas.NAS{
 				NASSecurityGroups: []nas.NASSecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAddDescriptionToNASSecurityGroup(t *testing.T) {
 			input: nas.NAS{
 				NASSecurityGroups: []nas.NASSecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("Managed by Terraform", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("Managed by Terraform", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -48,8 +48,8 @@ func TestCheckAddDescriptionToNASSecurityGroup(t *testing.T) {
 			input: nas.NAS{
 				NASSecurityGroups: []nas.NASSecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("some proper description", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("some proper description", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/nas/no_common_private_nas_instance_test.go b/checks/cloud/nifcloud/nas/no_common_private_nas_instance_test.go
index da97f9ad..f4078be8 100644
--- a/checks/cloud/nifcloud/nas/no_common_private_nas_instance_test.go
+++ b/checks/cloud/nifcloud/nas/no_common_private_nas_instance_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/nas"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
@@ -24,8 +24,8 @@ func TestCheckNoCommonPrivateNASInstance(t *testing.T) {
 			input: nas.NAS{
 				NASInstances: []nas.NASInstance{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						NetworkID: defsecTypes.String("net-COMMON_PRIVATE", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						NetworkID: trivyTypes.String("net-COMMON_PRIVATE", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoCommonPrivateNASInstance(t *testing.T) {
 			input: nas.NAS{
 				NASInstances: []nas.NASInstance{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						NetworkID: defsecTypes.String("net-some-private-lan", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						NetworkID: trivyTypes.String("net-some-private-lan", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr_test.go b/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr_test.go
index 9ae934f0..94f99e2e 100644
--- a/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr_test.go
+++ b/checks/cloud/nifcloud/nas/no_public_ingress_nas_sgr_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/nas"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
@@ -24,9 +24,9 @@ func TestCheckNoPublicIngressnasSgr(t *testing.T) {
 			input: nas.NAS{
 				NASSecurityGroups: []nas.NASSecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						CIDRs: []defsecTypes.StringValue{
-							defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						CIDRs: []trivyTypes.StringValue{
+							trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -38,9 +38,9 @@ func TestCheckNoPublicIngressnasSgr(t *testing.T) {
 			input: nas.NAS{
 				NASSecurityGroups: []nas.NASSecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						CIDRs: []defsecTypes.StringValue{
-							defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						CIDRs: []trivyTypes.StringValue{
+							trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/nifcloud/network/add_security_group_to_router_test.go b/checks/cloud/nifcloud/network/add_security_group_to_router_test.go
index f0b2c8b7..00c12143 100644
--- a/checks/cloud/nifcloud/network/add_security_group_to_router_test.go
+++ b/checks/cloud/nifcloud/network/add_security_group_to_router_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAddSecurityGroupToRouter(t *testing.T) {
 			input: network.Network{
 				Routers: []network.Router{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						SecurityGroup: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						SecurityGroup: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAddSecurityGroupToRouter(t *testing.T) {
 			input: network.Network{
 				Routers: []network.Router{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						SecurityGroup: defsecTypes.String("some security group", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						SecurityGroup: trivyTypes.String("some security group", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway_test.go b/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway_test.go
index dfca1767..5b905e5b 100644
--- a/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway_test.go
+++ b/checks/cloud/nifcloud/network/add_security_group_to_vpn_gateway_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAddSecurityGroupToVpnGateway(t *testing.T) {
 			input: network.Network{
 				VpnGateways: []network.VpnGateway{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						SecurityGroup: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						SecurityGroup: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAddSecurityGroupToVpnGateway(t *testing.T) {
 			input: network.Network{
 				VpnGateways: []network.VpnGateway{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						SecurityGroup: defsecTypes.String("some security group", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						SecurityGroup: trivyTypes.String("some security group", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/network/http_not_used_test.go b/checks/cloud/nifcloud/network/http_not_used_test.go
index 1d5fbb64..04dc04a6 100644
--- a/checks/cloud/nifcloud/network/http_not_used_test.go
+++ b/checks/cloud/nifcloud/network/http_not_used_test.go
@@ -3,7 +3,7 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,16 +24,16 @@ func TestCheckHttpNotUsed(t *testing.T) {
 			input: network.Network{
 				ElasticLoadBalancers: []network.ElasticLoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []network.NetworkInterface{{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							NetworkID:    defsecTypes.String("net-COMMON_GLOBAL", defsecTypes.NewTestMetadata()),
-							IsVipNetwork: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							NetworkID:    trivyTypes.String("net-COMMON_GLOBAL", trivyTypes.NewTestMetadata()),
+							IsVipNetwork: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						}},
 						Listeners: []network.ElasticLoadBalancerListener{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("HTTP", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("HTTP", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -46,16 +46,16 @@ func TestCheckHttpNotUsed(t *testing.T) {
 			input: network.Network{
 				ElasticLoadBalancers: []network.ElasticLoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []network.NetworkInterface{{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							NetworkID:    defsecTypes.String("some-network", defsecTypes.NewTestMetadata()),
-							IsVipNetwork: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							NetworkID:    trivyTypes.String("some-network", trivyTypes.NewTestMetadata()),
+							IsVipNetwork: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						}},
 						Listeners: []network.ElasticLoadBalancerListener{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("HTTP", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("HTTP", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -68,16 +68,16 @@ func TestCheckHttpNotUsed(t *testing.T) {
 			input: network.Network{
 				ElasticLoadBalancers: []network.ElasticLoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []network.NetworkInterface{{
-							Metadata:     defsecTypes.NewTestMetadata(),
-							NetworkID:    defsecTypes.String("net-COMMON_GLOBAL", defsecTypes.NewTestMetadata()),
-							IsVipNetwork: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+							Metadata:     trivyTypes.NewTestMetadata(),
+							NetworkID:    trivyTypes.String("net-COMMON_GLOBAL", trivyTypes.NewTestMetadata()),
+							IsVipNetwork: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 						}},
 						Listeners: []network.ElasticLoadBalancerListener{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("HTTPS", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("HTTPS", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -90,11 +90,11 @@ func TestCheckHttpNotUsed(t *testing.T) {
 			input: network.Network{
 				LoadBalancers: []network.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Listeners: []network.LoadBalancerListener{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("HTTP", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("HTTP", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -107,11 +107,11 @@ func TestCheckHttpNotUsed(t *testing.T) {
 			input: network.Network{
 				LoadBalancers: []network.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Listeners: []network.LoadBalancerListener{
 							{
-								Metadata: defsecTypes.NewTestMetadata(),
-								Protocol: defsecTypes.String("HTTPS", defsecTypes.NewTestMetadata()),
+								Metadata: trivyTypes.NewTestMetadata(),
+								Protocol: trivyTypes.String("HTTPS", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/nifcloud/network/no_common_private_elb_test.go b/checks/cloud/nifcloud/network/no_common_private_elb_test.go
index 0e8d814e..d047891b 100644
--- a/checks/cloud/nifcloud/network/no_common_private_elb_test.go
+++ b/checks/cloud/nifcloud/network/no_common_private_elb_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
@@ -24,11 +24,11 @@ func TestCheckNoCommonPrivateElasticLoadBalancer(t *testing.T) {
 			input: network.Network{
 				ElasticLoadBalancers: []network.ElasticLoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []network.NetworkInterface{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								NetworkID: defsecTypes.String("net-COMMON_PRIVATE", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								NetworkID: trivyTypes.String("net-COMMON_PRIVATE", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckNoCommonPrivateElasticLoadBalancer(t *testing.T) {
 			input: network.Network{
 				ElasticLoadBalancers: []network.ElasticLoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []network.NetworkInterface{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								NetworkID: defsecTypes.String("net-some-private-lan", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								NetworkID: trivyTypes.String("net-some-private-lan", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/nifcloud/network/no_common_private_router_test.go b/checks/cloud/nifcloud/network/no_common_private_router_test.go
index bd271954..8187e3f6 100644
--- a/checks/cloud/nifcloud/network/no_common_private_router_test.go
+++ b/checks/cloud/nifcloud/network/no_common_private_router_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
@@ -24,11 +24,11 @@ func TestCheckNoCommonPrivateRouter(t *testing.T) {
 			input: network.Network{
 				Routers: []network.Router{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []network.NetworkInterface{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								NetworkID: defsecTypes.String("net-COMMON_PRIVATE", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								NetworkID: trivyTypes.String("net-COMMON_PRIVATE", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,11 +41,11 @@ func TestCheckNoCommonPrivateRouter(t *testing.T) {
 			input: network.Network{
 				Routers: []network.Router{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						NetworkInterfaces: []network.NetworkInterface{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								NetworkID: defsecTypes.String("net-some-private-lan", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								NetworkID: trivyTypes.String("net-some-private-lan", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/nifcloud/network/use_secure_tls_policy_test.go b/checks/cloud/nifcloud/network/use_secure_tls_policy_test.go
index 08b084d3..dded26e6 100644
--- a/checks/cloud/nifcloud/network/use_secure_tls_policy_test.go
+++ b/checks/cloud/nifcloud/network/use_secure_tls_policy_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/network"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -21,12 +21,12 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: network.Network{
 				LoadBalancers: []network.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Listeners: []network.LoadBalancerListener{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								TLSPolicy: defsecTypes.String("Standard Ciphers A ver1", defsecTypes.NewTestMetadata()),
-								Protocol:  defsecTypes.String("HTTPS", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								TLSPolicy: trivyTypes.String("Standard Ciphers A ver1", trivyTypes.NewTestMetadata()),
+								Protocol:  trivyTypes.String("HTTPS", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -39,12 +39,12 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: network.Network{
 				LoadBalancers: []network.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Listeners: []network.LoadBalancerListener{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								TLSPolicy: defsecTypes.String("Standard Ciphers D ver1", defsecTypes.NewTestMetadata()),
-								Protocol:  defsecTypes.String("HTTPS", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								TLSPolicy: trivyTypes.String("Standard Ciphers D ver1", trivyTypes.NewTestMetadata()),
+								Protocol:  trivyTypes.String("HTTPS", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -57,12 +57,12 @@ func TestCheckUseSecureTlsPolicy(t *testing.T) {
 			input: network.Network{
 				LoadBalancers: []network.LoadBalancer{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Listeners: []network.LoadBalancerListener{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								TLSPolicy: defsecTypes.String("", defsecTypes.NewTestMetadata()),
-								Protocol:  defsecTypes.String("ICMP", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								TLSPolicy: trivyTypes.String("", trivyTypes.NewTestMetadata()),
+								Protocol:  trivyTypes.String("ICMP", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/nifcloud/rdb/add_description_to_db_security_group_test.go b/checks/cloud/nifcloud/rdb/add_description_to_db_security_group_test.go
index d2a23bae..453d4815 100644
--- a/checks/cloud/nifcloud/rdb/add_description_to_db_security_group_test.go
+++ b/checks/cloud/nifcloud/rdb/add_description_to_db_security_group_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckAddDescriptionToDBSecurityGroup(t *testing.T) {
 			input: rdb.RDB{
 				DBSecurityGroups: []rdb.DBSecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckAddDescriptionToDBSecurityGroup(t *testing.T) {
 			input: rdb.RDB{
 				DBSecurityGroups: []rdb.DBSecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("Managed by Terraform", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("Managed by Terraform", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -48,8 +48,8 @@ func TestCheckAddDescriptionToDBSecurityGroup(t *testing.T) {
 			input: rdb.RDB{
 				DBSecurityGroups: []rdb.DBSecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("some proper description", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("some proper description", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/rdb/no_common_private_db_instance_test.go b/checks/cloud/nifcloud/rdb/no_common_private_db_instance_test.go
index 9da7c643..62fb5258 100644
--- a/checks/cloud/nifcloud/rdb/no_common_private_db_instance_test.go
+++ b/checks/cloud/nifcloud/rdb/no_common_private_db_instance_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
@@ -24,8 +24,8 @@ func TestCheckNoCommonPrivateDBInstance(t *testing.T) {
 			input: rdb.RDB{
 				DBInstances: []rdb.DBInstance{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						NetworkID: defsecTypes.String("net-COMMON_PRIVATE", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						NetworkID: trivyTypes.String("net-COMMON_PRIVATE", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoCommonPrivateDBInstance(t *testing.T) {
 			input: rdb.RDB{
 				DBInstances: []rdb.DBInstance{
 					{
-						Metadata:  defsecTypes.NewTestMetadata(),
-						NetworkID: defsecTypes.String("net-some-private-lan", defsecTypes.NewTestMetadata()),
+						Metadata:  trivyTypes.NewTestMetadata(),
+						NetworkID: trivyTypes.String("net-some-private-lan", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/rdb/no_public_db_access_test.go b/checks/cloud/nifcloud/rdb/no_public_db_access_test.go
index c4426a19..33864063 100644
--- a/checks/cloud/nifcloud/rdb/no_public_db_access_test.go
+++ b/checks/cloud/nifcloud/rdb/no_public_db_access_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoPublicDbAccess(t *testing.T) {
 			input: rdb.RDB{
 				DBInstances: []rdb.DBInstance{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						PublicAccess: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						PublicAccess: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoPublicDbAccess(t *testing.T) {
 			input: rdb.RDB{
 				DBInstances: []rdb.DBInstance{
 					{
-						Metadata:     defsecTypes.NewTestMetadata(),
-						PublicAccess: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
+						Metadata:     trivyTypes.NewTestMetadata(),
+						PublicAccess: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr_test.go b/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr_test.go
index 76830def..4955399d 100644
--- a/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr_test.go
+++ b/checks/cloud/nifcloud/rdb/no_public_ingress_db_sgr_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 
@@ -24,9 +24,9 @@ func TestCheckNoPublicIngressDBSgr(t *testing.T) {
 			input: rdb.RDB{
 				DBSecurityGroups: []rdb.DBSecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						CIDRs: []defsecTypes.StringValue{
-							defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						CIDRs: []trivyTypes.StringValue{
+							trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -38,9 +38,9 @@ func TestCheckNoPublicIngressDBSgr(t *testing.T) {
 			input: rdb.RDB{
 				DBSecurityGroups: []rdb.DBSecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						CIDRs: []defsecTypes.StringValue{
-							defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						CIDRs: []trivyTypes.StringValue{
+							trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/nifcloud/rdb/specify_backup_retention_test.go b/checks/cloud/nifcloud/rdb/specify_backup_retention_test.go
index 8bd5fd27..62b6686e 100644
--- a/checks/cloud/nifcloud/rdb/specify_backup_retention_test.go
+++ b/checks/cloud/nifcloud/rdb/specify_backup_retention_test.go
@@ -3,7 +3,7 @@ package rdb
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckBackupRetentionSpecified(t *testing.T) {
 			input: rdb.RDB{
 				DBInstances: []rdb.DBInstance{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						BackupRetentionPeriodDays: defsecTypes.Int(1, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						BackupRetentionPeriodDays: trivyTypes.Int(1, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckBackupRetentionSpecified(t *testing.T) {
 			input: rdb.RDB{
 				DBInstances: []rdb.DBInstance{
 					{
-						Metadata:                  defsecTypes.NewTestMetadata(),
-						BackupRetentionPeriodDays: defsecTypes.Int(5, defsecTypes.NewTestMetadata()),
+						Metadata:                  trivyTypes.NewTestMetadata(),
+						BackupRetentionPeriodDays: trivyTypes.Int(5, trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates_test.go b/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates_test.go
index 7b27bea8..5f0bb514 100644
--- a/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates_test.go
+++ b/checks/cloud/nifcloud/sslcertificate/remove_expired_certificates_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/sslcertificate"
 	"github.com/aquasecurity/trivy/pkg/iac/scan"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -27,8 +27,8 @@ func TestCheckRemoveExpiredCertificates(t *testing.T) {
 			input: sslcertificate.SSLCertificate{
 				ServerCertificates: []sslcertificate.ServerCertificate{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Expiration: defsecTypes.Time(time.Now().Add(time.Hour), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Expiration: trivyTypes.Time(time.Now().Add(time.Hour), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -39,8 +39,8 @@ func TestCheckRemoveExpiredCertificates(t *testing.T) {
 			input: sslcertificate.SSLCertificate{
 				ServerCertificates: []sslcertificate.ServerCertificate{
 					{
-						Metadata:   defsecTypes.NewTestMetadata(),
-						Expiration: defsecTypes.Time(time.Now().Add(-time.Hour), defsecTypes.NewTestMetadata()),
+						Metadata:   trivyTypes.NewTestMetadata(),
+						Expiration: trivyTypes.Time(time.Now().Add(-time.Hour), trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/openstack/compute/no_plaintext_password_test.go b/checks/cloud/openstack/compute/no_plaintext_password_test.go
index c318df2e..c5e7299c 100644
--- a/checks/cloud/openstack/compute/no_plaintext_password_test.go
+++ b/checks/cloud/openstack/compute/no_plaintext_password_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoPlaintextPassword(t *testing.T) {
 			input: openstack.Compute{
 				Instances: []openstack.Instance{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						AdminPassword: defsecTypes.String("very-secret", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						AdminPassword: trivyTypes.String("very-secret", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoPlaintextPassword(t *testing.T) {
 			input: openstack.Compute{
 				Instances: []openstack.Instance{
 					{
-						Metadata:      defsecTypes.NewTestMetadata(),
-						AdminPassword: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:      trivyTypes.NewTestMetadata(),
+						AdminPassword: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/openstack/compute/no_public_access_test.go b/checks/cloud/openstack/compute/no_public_access_test.go
index 7e098f14..58c38d14 100644
--- a/checks/cloud/openstack/compute/no_public_access_test.go
+++ b/checks/cloud/openstack/compute/no_public_access_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -25,10 +25,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 				Firewall: openstack.Firewall{
 					AllowRules: []openstack.FirewallRule{
 						{
-							Metadata:    defsecTypes.NewTestMetadata(),
-							Enabled:     defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Destination: defsecTypes.String("", defsecTypes.NewTestMetadata()),
-							Source:      defsecTypes.String("10.10.10.1", defsecTypes.NewTestMetadata()),
+							Metadata:    trivyTypes.NewTestMetadata(),
+							Enabled:     trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Destination: trivyTypes.String("", trivyTypes.NewTestMetadata()),
+							Source:      trivyTypes.String("10.10.10.1", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -41,10 +41,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 				Firewall: openstack.Firewall{
 					AllowRules: []openstack.FirewallRule{
 						{
-							Metadata:    defsecTypes.NewTestMetadata(),
-							Enabled:     defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Destination: defsecTypes.String("10.10.10.2", defsecTypes.NewTestMetadata()),
-							Source:      defsecTypes.String("", defsecTypes.NewTestMetadata()),
+							Metadata:    trivyTypes.NewTestMetadata(),
+							Enabled:     trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Destination: trivyTypes.String("10.10.10.2", trivyTypes.NewTestMetadata()),
+							Source:      trivyTypes.String("", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -57,10 +57,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 				Firewall: openstack.Firewall{
 					AllowRules: []openstack.FirewallRule{
 						{
-							Metadata:    defsecTypes.NewTestMetadata(),
-							Enabled:     defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Destination: defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
-							Source:      defsecTypes.String("0.0.0.0", defsecTypes.NewTestMetadata()),
+							Metadata:    trivyTypes.NewTestMetadata(),
+							Enabled:     trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Destination: trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
+							Source:      trivyTypes.String("0.0.0.0", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
@@ -73,10 +73,10 @@ func TestCheckNoPublicAccess(t *testing.T) {
 				Firewall: openstack.Firewall{
 					AllowRules: []openstack.FirewallRule{
 						{
-							Metadata:    defsecTypes.NewTestMetadata(),
-							Enabled:     defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-							Destination: defsecTypes.String("10.10.10.1", defsecTypes.NewTestMetadata()),
-							Source:      defsecTypes.String("10.10.10.2", defsecTypes.NewTestMetadata()),
+							Metadata:    trivyTypes.NewTestMetadata(),
+							Enabled:     trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+							Destination: trivyTypes.String("10.10.10.1", trivyTypes.NewTestMetadata()),
+							Source:      trivyTypes.String("10.10.10.2", trivyTypes.NewTestMetadata()),
 						},
 					},
 				},
diff --git a/checks/cloud/openstack/networking/add_description_to_security_group_test.go b/checks/cloud/openstack/networking/add_description_to_security_group_test.go
index 7413a2b0..9ca46bac 100644
--- a/checks/cloud/openstack/networking/add_description_to_security_group_test.go
+++ b/checks/cloud/openstack/networking/add_description_to_security_group_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckSecurityGroupHasDescription(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckSecurityGroupHasDescription(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata:    defsecTypes.NewTestMetadata(),
-						Description: defsecTypes.String("this is for connecting to the database", defsecTypes.NewTestMetadata()),
+						Metadata:    trivyTypes.NewTestMetadata(),
+						Description: trivyTypes.String("this is for connecting to the database", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/cloud/openstack/networking/no_public_egress_test.go b/checks/cloud/openstack/networking/no_public_egress_test.go
index 9f503a60..9659b35d 100644
--- a/checks/cloud/openstack/networking/no_public_egress_test.go
+++ b/checks/cloud/openstack/networking/no_public_egress_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []openstack.SecurityGroupRule{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsIngress: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CIDR:      defsecTypes.String("", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsIngress: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CIDR:      trivyTypes.String("", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,12 +42,12 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []openstack.SecurityGroupRule{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsIngress: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CIDR:      defsecTypes.String("10.10.0.1", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsIngress: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CIDR:      trivyTypes.String("10.10.0.1", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -60,12 +60,12 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []openstack.SecurityGroupRule{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsIngress: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CIDR:      defsecTypes.String("8.8.8.8", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsIngress: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CIDR:      trivyTypes.String("8.8.8.8", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -78,12 +78,12 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []openstack.SecurityGroupRule{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsIngress: defsecTypes.Bool(false, defsecTypes.NewTestMetadata()),
-								CIDR:      defsecTypes.String("80.0.0.0/8", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsIngress: trivyTypes.Bool(false, trivyTypes.NewTestMetadata()),
+								CIDR:      trivyTypes.String("80.0.0.0/8", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/openstack/networking/no_public_ingress_test.go b/checks/cloud/openstack/networking/no_public_ingress_test.go
index b3a29bd9..fa881f21 100644
--- a/checks/cloud/openstack/networking/no_public_ingress_test.go
+++ b/checks/cloud/openstack/networking/no_public_ingress_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,12 +24,12 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []openstack.SecurityGroupRule{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsIngress: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CIDR:      defsecTypes.String("", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsIngress: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CIDR:      trivyTypes.String("", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -42,12 +42,12 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []openstack.SecurityGroupRule{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsIngress: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CIDR:      defsecTypes.String("10.10.0.1", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsIngress: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CIDR:      trivyTypes.String("10.10.0.1", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -60,12 +60,12 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []openstack.SecurityGroupRule{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsIngress: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CIDR:      defsecTypes.String("8.8.8.8", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsIngress: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CIDR:      trivyTypes.String("8.8.8.8", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -78,12 +78,12 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			input: openstack.Networking{
 				SecurityGroups: []openstack.SecurityGroup{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Rules: []openstack.SecurityGroupRule{
 							{
-								Metadata:  defsecTypes.NewTestMetadata(),
-								IsIngress: defsecTypes.Bool(true, defsecTypes.NewTestMetadata()),
-								CIDR:      defsecTypes.String("80.0.0.0/8", defsecTypes.NewTestMetadata()),
+								Metadata:  trivyTypes.NewTestMetadata(),
+								IsIngress: trivyTypes.Bool(true, trivyTypes.NewTestMetadata()),
+								CIDR:      trivyTypes.String("80.0.0.0/8", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/cloud/oracle/compute/no_public_ip_test.go b/checks/cloud/oracle/compute/no_public_ip_test.go
index a8fd8b4f..29c84399 100644
--- a/checks/cloud/oracle/compute/no_public_ip_test.go
+++ b/checks/cloud/oracle/compute/no_public_ip_test.go
@@ -3,7 +3,7 @@ package compute
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -24,8 +24,8 @@ func TestCheckNoPublicIp(t *testing.T) {
 			input: oracle.Compute{
 				AddressReservations: []oracle.AddressReservation{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Pool:     defsecTypes.String("public-ippool", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Pool:     trivyTypes.String("public-ippool", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
@@ -36,8 +36,8 @@ func TestCheckNoPublicIp(t *testing.T) {
 			input: oracle.Compute{
 				AddressReservations: []oracle.AddressReservation{
 					{
-						Metadata: defsecTypes.NewTestMetadata(),
-						Pool:     defsecTypes.String("cloud-ippool", defsecTypes.NewTestMetadata()),
+						Metadata: trivyTypes.NewTestMetadata(),
+						Pool:     trivyTypes.String("cloud-ippool", trivyTypes.NewTestMetadata()),
 					},
 				},
 			},
diff --git a/checks/kubernetes/network/no_public_egress_test.go b/checks/kubernetes/network/no_public_egress_test.go
index 72f815e9..c0ee6be0 100644
--- a/checks/kubernetes/network/no_public_egress_test.go
+++ b/checks/kubernetes/network/no_public_egress_test.go
@@ -3,7 +3,7 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,13 +23,13 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			name: "Public destination CIDR",
 			input: []kubernetes.NetworkPolicy{
 				{
-					Metadata: defsecTypes.NewTestMetadata(),
+					Metadata: trivyTypes.NewTestMetadata(),
 					Spec: kubernetes.NetworkPolicySpec{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Egress: kubernetes.Egress{
-							Metadata: defsecTypes.NewTestMetadata(),
-							DestinationCIDRs: []defsecTypes.StringValue{
-								defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							DestinationCIDRs: []trivyTypes.StringValue{
+								trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,13 +41,13 @@ func TestCheckNoPublicEgress(t *testing.T) {
 			name: "Private destination CIDR",
 			input: []kubernetes.NetworkPolicy{
 				{
-					Metadata: defsecTypes.NewTestMetadata(),
+					Metadata: trivyTypes.NewTestMetadata(),
 					Spec: kubernetes.NetworkPolicySpec{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Egress: kubernetes.Egress{
-							Metadata: defsecTypes.NewTestMetadata(),
-							DestinationCIDRs: []defsecTypes.StringValue{
-								defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							DestinationCIDRs: []trivyTypes.StringValue{
+								trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
diff --git a/checks/kubernetes/network/no_public_ingress_test.go b/checks/kubernetes/network/no_public_ingress_test.go
index 7a5baf8e..c5c1ee4c 100644
--- a/checks/kubernetes/network/no_public_ingress_test.go
+++ b/checks/kubernetes/network/no_public_ingress_test.go
@@ -3,7 +3,7 @@ package network
 import (
 	"testing"
 
-	defsecTypes "github.com/aquasecurity/trivy/pkg/iac/types"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 
@@ -23,13 +23,13 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			name: "Public source CIDR",
 			input: []kubernetes.NetworkPolicy{
 				{
-					Metadata: defsecTypes.NewTestMetadata(),
+					Metadata: trivyTypes.NewTestMetadata(),
 					Spec: kubernetes.NetworkPolicySpec{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Ingress: kubernetes.Ingress{
-							Metadata: defsecTypes.NewTestMetadata(),
-							SourceCIDRs: []defsecTypes.StringValue{
-								defsecTypes.String("0.0.0.0/0", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							SourceCIDRs: []trivyTypes.StringValue{
+								trivyTypes.String("0.0.0.0/0", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},
@@ -41,13 +41,13 @@ func TestCheckNoPublicIngress(t *testing.T) {
 			name: "Private source CIDR",
 			input: []kubernetes.NetworkPolicy{
 				{
-					Metadata: defsecTypes.NewTestMetadata(),
+					Metadata: trivyTypes.NewTestMetadata(),
 					Spec: kubernetes.NetworkPolicySpec{
-						Metadata: defsecTypes.NewTestMetadata(),
+						Metadata: trivyTypes.NewTestMetadata(),
 						Ingress: kubernetes.Ingress{
-							Metadata: defsecTypes.NewTestMetadata(),
-							SourceCIDRs: []defsecTypes.StringValue{
-								defsecTypes.String("10.0.0.0/16", defsecTypes.NewTestMetadata()),
+							Metadata: trivyTypes.NewTestMetadata(),
+							SourceCIDRs: []trivyTypes.StringValue{
+								trivyTypes.String("10.0.0.0/16", trivyTypes.NewTestMetadata()),
 							},
 						},
 					},