diff --git a/docs/cfn-schema-specification.md b/docs/cfn-schema-specification.md
index 1135ffc1cd..49ad32a7b0 100644
--- a/docs/cfn-schema-specification.md
+++ b/docs/cfn-schema-specification.md
@@ -5,35 +5,70 @@ The core linting of `cfn-lint` is based on the [CloudFormation resource provider
 Resource provider schemas are based on [JSON Schema](https://json-schema.org) and include modifications for the service to work with CloudFormation.
 
 ## Rules based on the Specifications
+
 There are multiple rules that are based on information from the specification files. Every keyword in the [draft-07](https://json-schema.org/draft-07/json-schema-release-notes) are accounted for by cfn-lint. In a lot of scenarios we will remap those validators to cfn-lint rule IDs so the rules can be suppressed as needed.
 
 ## Changes to JSON schema validation
+
 To improve the experience of validation we have made modifications to standard JSON schema so that it works better with CloudFormation.
 
 ### Type checking
+
 CloudFormation allows types to work interchangeably as long as a conversion can be done (Example: "10" and 10 are equivalent). As a result we have modified type checking to validate the values are of the right type.
 
 ## Grouping functions
+
 CloudFormation allows for a value of a property to be `{"Ref": "AWS:NoValue"}` which is equivalent to that property not being specified. JSON schema validators that work on a set of properties (object or array) are validated after the properties have been cleaned of these no values. This will allow validators like required and dependencies to work as intended.
 
 ### Intrinsic functions
+
 When resource provider schemas are created they do not account for CloudFormation [intrinsic functions](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html). cfn-lint will account for these intrinsic functions by validating the structure of the function. Additionally, if possible, the value will be resolved (Example: `{"Ref": "AWS::Region"}` will resolve to "us-east-1") and that value will be validated against the schema.
 
 ## Extending JSON schema validation
 
 ### Extending the schemas with AWS types
+
 Certain resource properties represent a type that is common across many resource types (example: availaibility zones, AMIs, VPCs, IAM identity policies, etc.). To provide common validation of these types we have extended the resource provider schemas with a type of `awsType` the value for the keyword is the type name. For a list of supported types go here.
 
 ### Extending the schemas with more JSON schemas
+
 Resource types may have complex rules to define what a valid resource configuration is (example: for RDS the properties you need to specify can change based on the engine and if you are restoring from a snapshot). cfn-lint extends the resource provider schema with the keyworkd `cfnLint` which will validate the appropriate level against additional schema documents. This mechanism allows cfn-lint rule writers to create a new rule ID for these additional schemas which then allow users of cfn-lint to disable these validations as needed.
 
 ### Extending the schemas with new keywords
+
 To make schema writing easier across hundereds of resources we have extend the schemas to include some additional keywords. While these keywords can be covered under the JSON schema they have to be done with a combination of `if`s, `onlyOne`s, `anyOf`s, etc. By using these keywords we can extend the schema for common scenarios when writing CloudFormation schemas.
 
+#### pattern
+
+_pattern_ keyword is used to validate a string against a regular expression. [JSON Schema docs](https://json-schema.org/understanding-json-schema/reference/string#regexp)
+
+#### enum
+
+_enum_ is used to restrict a value to a fixed set of values. [JSON Schema docs](https://json-schema.org/understanding-json-schema/reference/string#enum)
+
+#### number range
+
+_minimum_ and _maximum_ is used to define the inclusive range for a number or integer.
+_exclusiveMinimum_ and _exclusiveMaximum_ is used to define the exlusive range for a number or integer.
+
+#### array length
+
+_minItems_ and _maxItems_ is used to provide the inclusive length of an array.
+
+#### properties
+
+_properties_ provides the key names and a value that represents the schema to validate the property for an object. [JSON Schema Docs](https://json-schema.org/understanding-json-schema/reference/object#properties)
+
+#### required
+
+_required_ defines a list of required properties. [JSON Schema docs](https://json-schema.org/understanding-json-schema/reference/object#required)
+
 #### requiredXor
-*requiredXor* is used to define when only one property from a set properties is required.
+
+_requiredXor_ is used to define when only one property from a set properties is required.
 
 On the following defined object
+
 ```json
 {
   "properties": {
@@ -44,13 +79,17 @@ On the following defined object
   "additionalProperties": false
 }
 ```
+
 The cfn-lint schema
+
 ```json
 {
   "requiredXor": ["a", "b", "c"]
 }
 ```
+
 is equivalent to the JSON schema
+
 ```json
 {
   "oneOf": [
@@ -68,9 +107,11 @@ is equivalent to the JSON schema
 ```
 
 #### propertiesNand
-*propertiesNand* is used to define when none or only one property from a set properties can be defined.
+
+_propertiesNand_ is used to define when none or only one property from a set properties can be defined.
 
 On the following defined object
+
 ```json
 {
   "properties": {
@@ -83,12 +124,15 @@ On the following defined object
 ```
 
 The cfn-lint schema
+
 ```json
 {
   "propertiesNand": ["a", "b", "c"]
 }
 ```
+
 is equivalent to the JSON schema
+
 ```json
 {
   "oneOf": [
@@ -102,23 +146,26 @@ is equivalent to the JSON schema
       "required": ["c"]
     },
     {
-     "properties": {
-       "a": false,
-       "b": false,
-       "c": false
-     }
+      "properties": {
+        "a": false,
+        "b": false,
+        "c": false
+      }
     }
   ]
 }
 ```
 
 #### dependentRequired
-*dependentRequired* has been backported into cfn-lint.  You can read the definition [here](https://json-schema.org/understanding-json-schema/reference/conditionals#dependentRequired)
+
+_dependentRequired_ has been backported into cfn-lint. You can read the definition [here](https://json-schema.org/understanding-json-schema/reference/conditionals#dependentRequired)
 
 #### dependentExcluded
-*dependentExcluded* is the opposite of dependentRequired. The list of properties should not be specified when the key property is specified.
+
+_dependentExcluded_ is the opposite of dependentRequired. The list of properties should not be specified when the key property is specified.
 
 On the following defined object
+
 ```json
 {
   "properties": {
@@ -131,6 +178,7 @@ On the following defined object
 ```
 
 The cfn-lint schema
+
 ```json
 {
   "dependentExcluded": {
@@ -138,7 +186,9 @@ The cfn-lint schema
   }
 }
 ```
+
 is equivalent to the JSON schema
+
 ```json
 {
   "dependencies": {
@@ -153,4 +203,9 @@ is equivalent to the JSON schema
 ```
 
 #### prefixItems
-*prefixItems* is similar to the definition of [prefixItems](https://json-schema.org/understanding-json-schema/reference/array#tupleValidation) but doesn't actually do the prefix. The current resource schema doesn't support [items](https://json-schema.org/understanding-json-schema/reference/array#items) being an array. We use `prefixItems` to validate array items where ordering matters.
+
+_prefixItems_ is similar to the definition of [prefixItems](https://json-schema.org/understanding-json-schema/reference/array#tupleValidation) but doesn't actually do the prefix. The current resource schema doesn't support [items](https://json-schema.org/understanding-json-schema/reference/array#items) being an array. We use `prefixItems` to validate array items where ordering matters.
+
+#### type
+
+_type_ specifies the data type for a schema. [JSON Schema docs](https://json-schema.org/understanding-json-schema/reference/type)
diff --git a/src/cfnlint/rules/parameters/AllowedValue.py b/src/cfnlint/rules/parameters/Enum.py
similarity index 84%
rename from src/cfnlint/rules/parameters/AllowedValue.py
rename to src/cfnlint/rules/parameters/Enum.py
index af5adf66e6..5741e9f254 100644
--- a/src/cfnlint/rules/parameters/AllowedValue.py
+++ b/src/cfnlint/rules/parameters/Enum.py
@@ -7,7 +7,7 @@
 from cfnlint.rules import CloudFormationLintRule
 
 
-class AllowedValue(CloudFormationLintRule):
+class Enum(CloudFormationLintRule):
     """Check if parameters have a valid value"""
 
     id = "W2030"
@@ -16,7 +16,7 @@ class AllowedValue(CloudFormationLintRule):
         "Check if parameters have a valid value in case of an enumator. The Parameter's"
         " allowed values is based on the usages in property (Ref)"
     )
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedvalue"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#enum"
     tags = ["parameters", "resources", "property", "allowed value"]
 
     # This rule is triggered from the equivalent rule E3030
diff --git a/src/cfnlint/rules/parameters/NumberSize.py b/src/cfnlint/rules/parameters/NumberRange.py
similarity index 71%
rename from src/cfnlint/rules/parameters/NumberSize.py
rename to src/cfnlint/rules/parameters/NumberRange.py
index 2489f81d78..8fdccbc2c4 100644
--- a/src/cfnlint/rules/parameters/NumberSize.py
+++ b/src/cfnlint/rules/parameters/NumberRange.py
@@ -6,16 +6,16 @@
 from cfnlint.rules import CloudFormationLintRule
 
 
-class NumberSize(CloudFormationLintRule):
+class NumberRange(CloudFormationLintRule):
     """Check if a Number has a length within the limit"""
 
     id = "W3034"
     shortdesc = "Check if a number is between min and max"
     description = (
-        "Check numbers (integers and floats) for its value being between the minimum"
+        "Check numbers and integers for its value being between the minimum"
         " and maximum"
     )
-    source_url = "https://github.com/awslabs/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedpattern"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#number-size"
     tags = ["resources", "property", "number", "size"]
 
     def validate(self, validator, m, instance, schema, fn):
diff --git a/src/cfnlint/rules/parameters/AllowedPattern.py b/src/cfnlint/rules/parameters/Pattern.py
similarity index 79%
rename from src/cfnlint/rules/parameters/AllowedPattern.py
rename to src/cfnlint/rules/parameters/Pattern.py
index 0054b329e6..fa8a8938f3 100644
--- a/src/cfnlint/rules/parameters/AllowedPattern.py
+++ b/src/cfnlint/rules/parameters/Pattern.py
@@ -7,7 +7,7 @@
 from cfnlint.rules import CloudFormationLintRule
 
 
-class AllowedPattern(CloudFormationLintRule):
+class Pattern(CloudFormationLintRule):
     """Check if parameters have a valid value"""
 
     id = "W2031"
@@ -16,8 +16,8 @@ class AllowedPattern(CloudFormationLintRule):
         "Check if parameters have a valid value in a pattern. The Parameter's allowed"
         " pattern is based on the usages in property (Ref)"
     )
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedpattern"
-    tags = ["parameters", "resources", "property", "allowed pattern"]
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#pattern"
+    tags = ["parameters", "resources", "property", "pattern"]
 
     # This rule is triggered from the equivalent rule E3031
     # the values are fed from there and we adjust the error outputs
diff --git a/src/cfnlint/rules/resources/properties/ArrayLength.py b/src/cfnlint/rules/resources/properties/ArrayLength.py
new file mode 100644
index 0000000000..c4fc5eaef1
--- /dev/null
+++ b/src/cfnlint/rules/resources/properties/ArrayLength.py
@@ -0,0 +1,19 @@
+"""
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: MIT-0
+"""
+
+from cfnlint.rules import CloudFormationLintRule
+
+
+class ArrayLength(CloudFormationLintRule):
+    """Check if List has a size within the limit"""
+
+    id = "E3032"
+    shortdesc = "Check if a array has between min and max number of values specified"
+    description = (
+        "Check array for the number of items in the list to validate they are between"
+        " the minimum and maximum"
+    )
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#arraylength"
+    tags = ["resources", "property", "array", "length"]
diff --git a/src/cfnlint/rules/resources/properties/DependentExcluded.py b/src/cfnlint/rules/resources/properties/DependentExcluded.py
index 87adb73478..8086d1aaa3 100644
--- a/src/cfnlint/rules/resources/properties/DependentExcluded.py
+++ b/src/cfnlint/rules/resources/properties/DependentExcluded.py
@@ -16,5 +16,5 @@ class DependentExcluded(CloudFormationLintRule):
     description = (
         "When certain properties are specified other properties should not be included"
     )
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#dependentexcluded"
     tags = ["resources"]
diff --git a/src/cfnlint/rules/resources/properties/DependentRequired.py b/src/cfnlint/rules/resources/properties/DependentRequired.py
index f0f6419343..2d5d854613 100644
--- a/src/cfnlint/rules/resources/properties/DependentRequired.py
+++ b/src/cfnlint/rules/resources/properties/DependentRequired.py
@@ -6,7 +6,7 @@
 from cfnlint.rules import CloudFormationLintRule
 
 
-class DependentExcluded(CloudFormationLintRule):
+class DependentRequired(CloudFormationLintRule):
     """Check Required Resource Configuration"""
 
     id = "E3021"
@@ -18,5 +18,5 @@ class DependentExcluded(CloudFormationLintRule):
         "When certain properties are specified it results "
         "in other properties to be required"
     )
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#pr"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#dependentrequired"
     tags = ["resources"]
diff --git a/src/cfnlint/rules/resources/properties/Enum.py b/src/cfnlint/rules/resources/properties/Enum.py
index 88d0ab1cc0..903f8c027d 100644
--- a/src/cfnlint/rules/resources/properties/Enum.py
+++ b/src/cfnlint/rules/resources/properties/Enum.py
@@ -13,7 +13,7 @@ class Enum(CloudFormationLintRule):
     id = "E3030"
     shortdesc = "Check if properties have a valid value"
     description = "Check if properties have a valid value in case of an enumator"
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedvalue"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#enum"
     tags = ["resources", "property", "allowed value"]
     child_rules = {
         "W2030": None,
diff --git a/src/cfnlint/rules/resources/properties/ListSize.py b/src/cfnlint/rules/resources/properties/ListSize.py
deleted file mode 100644
index dfab5e76a1..0000000000
--- a/src/cfnlint/rules/resources/properties/ListSize.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-SPDX-License-Identifier: MIT-0
-"""
-
-from cfnlint.rules import CloudFormationLintRule
-
-
-class ListSize(CloudFormationLintRule):
-    """Check if List has a size within the limit"""
-
-    id = "E3032"
-    shortdesc = "Check if a list has between min and max number of values specified"
-    description = (
-        "Check lists for the number of items in the list to validate they are between"
-        " the minimum and maximum"
-    )
-    source_url = "https://github.com/awslabs/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedpattern"
-    tags = ["resources", "property", "list", "size"]
diff --git a/src/cfnlint/rules/resources/properties/MinMax.py b/src/cfnlint/rules/resources/properties/NumberRange.py
similarity index 98%
rename from src/cfnlint/rules/resources/properties/MinMax.py
rename to src/cfnlint/rules/resources/properties/NumberRange.py
index 3167738191..a798a7e5bd 100644
--- a/src/cfnlint/rules/resources/properties/MinMax.py
+++ b/src/cfnlint/rules/resources/properties/NumberRange.py
@@ -12,7 +12,7 @@
 from cfnlint.rules import CloudFormationLintRule
 
 
-class MinMax(CloudFormationLintRule):
+class NumberRange(CloudFormationLintRule):
     """Check if a Number has a length within the limit"""
 
     id = "E3034"
diff --git a/src/cfnlint/rules/resources/properties/OnlyOne.py b/src/cfnlint/rules/resources/properties/OneOf.py
similarity index 93%
rename from src/cfnlint/rules/resources/properties/OnlyOne.py
rename to src/cfnlint/rules/resources/properties/OneOf.py
index 79b246bdfd..310fcbdb85 100644
--- a/src/cfnlint/rules/resources/properties/OnlyOne.py
+++ b/src/cfnlint/rules/resources/properties/OneOf.py
@@ -6,7 +6,7 @@
 from cfnlint.rules import CloudFormationLintRule
 
 
-class OnlyOne(CloudFormationLintRule):
+class OneOf(CloudFormationLintRule):
     """Check Properties Resource Configuration"""
 
     id = "E3018"
diff --git a/src/cfnlint/rules/resources/properties/Pattern.py b/src/cfnlint/rules/resources/properties/Pattern.py
index 3fb75a1405..b99031707e 100644
--- a/src/cfnlint/rules/resources/properties/Pattern.py
+++ b/src/cfnlint/rules/resources/properties/Pattern.py
@@ -18,7 +18,7 @@ class Pattern(CloudFormationLintRule):
         "Check if properties have a valid value in case of a pattern (Regular"
         " Expression)"
     )
-    source_url = "https://github.com/awslabs/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedpattern"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#pattern"
     tags = ["resources", "property", "allowed pattern", "regex"]
     child_rules = {
         "W2031": None,
diff --git a/src/cfnlint/rules/resources/properties/PrefixItems.py b/src/cfnlint/rules/resources/properties/PrefixItems.py
index b9cdb8834e..ce3400291e 100644
--- a/src/cfnlint/rules/resources/properties/PrefixItems.py
+++ b/src/cfnlint/rules/resources/properties/PrefixItems.py
@@ -12,5 +12,5 @@ class PrefixItems(CloudFormationLintRule):
     id = "E3008"
     shortdesc = "Validate an array in order"
     description = "Will validate arrays in order for schema validation"
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#required"
-    tags = ["resources"]
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#prefixitems"
+    tags = ["resources", "properties", "array", "prefixItems"]
diff --git a/src/cfnlint/rules/resources/properties/Properties.py b/src/cfnlint/rules/resources/properties/Properties.py
index be3bb1e1d5..5eb969e26b 100644
--- a/src/cfnlint/rules/resources/properties/Properties.py
+++ b/src/cfnlint/rules/resources/properties/Properties.py
@@ -20,7 +20,7 @@ class Properties(BaseJsonSchema):
     id = "E3002"
     shortdesc = "Resource properties are invalid"
     description = "Making sure that resources properties are properly configured"
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#properties"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#properties"
     tags = ["resources"]
 
     def __init__(self):
diff --git a/src/cfnlint/rules/resources/properties/Required.py b/src/cfnlint/rules/resources/properties/Required.py
index 0d7382f3b3..ab7ca02f5f 100644
--- a/src/cfnlint/rules/resources/properties/Required.py
+++ b/src/cfnlint/rules/resources/properties/Required.py
@@ -12,5 +12,5 @@ class Required(CloudFormationLintRule):
     id = "E3003"
     shortdesc = "Required Resource properties are missing"
     description = "Making sure that Resources properties that are required exist"
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#required"
-    tags = ["resources"]
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#required"
+    tags = ["resources", "properties", "required"]
diff --git a/src/cfnlint/rules/resources/properties/RequiredXor.py b/src/cfnlint/rules/resources/properties/RequiredXor.py
index d85daa393e..6f40ae0527 100644
--- a/src/cfnlint/rules/resources/properties/RequiredXor.py
+++ b/src/cfnlint/rules/resources/properties/RequiredXor.py
@@ -12,5 +12,5 @@ class RequiredXor(CloudFormationLintRule):
     id = "E3014"
     shortdesc = "Validate only one of a set of required properties are specified"
     description = "Making sure that Resources properties that are required exist"
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#required"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#requiredxor"
     tags = ["resources"]
diff --git a/src/cfnlint/rules/resources/properties/MinMaxLength.py b/src/cfnlint/rules/resources/properties/StringLength.py
similarity index 99%
rename from src/cfnlint/rules/resources/properties/MinMaxLength.py
rename to src/cfnlint/rules/resources/properties/StringLength.py
index c3f85174c5..ebf59c95e5 100644
--- a/src/cfnlint/rules/resources/properties/MinMaxLength.py
+++ b/src/cfnlint/rules/resources/properties/StringLength.py
@@ -14,7 +14,7 @@
 from cfnlint.rules import CloudFormationLintRule
 
 
-class MinMaxLength(CloudFormationLintRule):
+class StringLength(CloudFormationLintRule):
     """Check if a String has a length within the limit"""
 
     id = "E3033"
diff --git a/src/cfnlint/rules/resources/properties/Type.py b/src/cfnlint/rules/resources/properties/Type.py
index 5c575b6cc0..6f9fb03418 100644
--- a/src/cfnlint/rules/resources/properties/Type.py
+++ b/src/cfnlint/rules/resources/properties/Type.py
@@ -17,7 +17,7 @@ class Type(CloudFormationLintRule):
         "Checks resource property values with Primitive Types for values that match"
         " those types."
     )
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
     tags = ["resources"]
 
     strict_exceptions = {
diff --git a/src/cfnlint/rules/resources/properties/UniqueItems.py b/src/cfnlint/rules/resources/properties/UniqueItems.py
index 545d6a0b05..e152ef3900 100644
--- a/src/cfnlint/rules/resources/properties/UniqueItems.py
+++ b/src/cfnlint/rules/resources/properties/UniqueItems.py
@@ -16,7 +16,7 @@ class UniqueItems(CloudFormationLintRule):
         "Certain lists don't support duplicate items. "
         "Check when duplicates are provided but not supported."
     )
-    source_url = "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedvalue"
+    source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#uniqueitems"
     tags = ["resources", "property", "list"]
     child_rules = {
         "I3037": None,
diff --git a/test/fixtures/results/quickstart/cis_benchmark.json b/test/fixtures/results/quickstart/cis_benchmark.json
index 87c2d0a6be..01e27677c8 100644
--- a/test/fixtures/results/quickstart/cis_benchmark.json
+++ b/test/fixtures/results/quickstart/cis_benchmark.json
@@ -1200,7 +1200,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1260,7 +1260,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1320,7 +1320,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1380,7 +1380,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1440,7 +1440,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1586,7 +1586,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
diff --git a/test/fixtures/results/quickstart/nist_application.json b/test/fixtures/results/quickstart/nist_application.json
index 7888710d50..845fd5daf3 100644
--- a/test/fixtures/results/quickstart/nist_application.json
+++ b/test/fixtures/results/quickstart/nist_application.json
@@ -609,7 +609,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -670,7 +670,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -699,7 +699,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -756,7 +756,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -787,7 +787,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -818,7 +818,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -875,7 +875,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -906,7 +906,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -937,7 +937,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -966,7 +966,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -995,7 +995,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1024,7 +1024,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1053,7 +1053,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1082,7 +1082,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1111,7 +1111,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1140,7 +1140,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1169,7 +1169,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1198,7 +1198,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1227,7 +1227,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1256,7 +1256,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1313,7 +1313,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1342,7 +1342,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1371,7 +1371,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1459,7 +1459,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1489,7 +1489,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1577,7 +1577,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1607,7 +1607,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1785,7 +1785,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1814,7 +1814,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1958,7 +1958,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1989,7 +1989,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2020,7 +2020,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2051,7 +2051,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2082,7 +2082,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2113,7 +2113,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2144,7 +2144,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2175,7 +2175,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2206,7 +2206,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2237,7 +2237,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2268,7 +2268,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2299,7 +2299,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2330,7 +2330,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2361,7 +2361,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2392,7 +2392,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2423,7 +2423,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2454,7 +2454,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2485,7 +2485,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2516,7 +2516,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2547,7 +2547,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2578,7 +2578,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2609,7 +2609,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2670,7 +2670,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -2703,7 +2703,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
diff --git a/test/fixtures/results/quickstart/nist_config_rules.json b/test/fixtures/results/quickstart/nist_config_rules.json
index 12de266af1..7db81b99b8 100644
--- a/test/fixtures/results/quickstart/nist_config_rules.json
+++ b/test/fixtures/results/quickstart/nist_config_rules.json
@@ -111,7 +111,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -197,7 +197,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     }
 ]
diff --git a/test/fixtures/results/quickstart/nist_high_main.json b/test/fixtures/results/quickstart/nist_high_main.json
index b61a5f5cda..5368226de5 100644
--- a/test/fixtures/results/quickstart/nist_high_main.json
+++ b/test/fixtures/results/quickstart/nist_high_main.json
@@ -609,7 +609,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -752,7 +752,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -808,7 +808,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -864,7 +864,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1122,7 +1122,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1178,7 +1178,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     }
 ]
diff --git a/test/fixtures/results/quickstart/nist_logging.json b/test/fixtures/results/quickstart/nist_logging.json
index a2cdf4aa4e..4d9e337683 100644
--- a/test/fixtures/results/quickstart/nist_logging.json
+++ b/test/fixtures/results/quickstart/nist_logging.json
@@ -113,7 +113,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -146,7 +146,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -343,7 +343,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -372,7 +372,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -401,7 +401,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -457,7 +457,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -682,7 +682,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -711,7 +711,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -740,7 +740,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -769,7 +769,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -798,7 +798,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -827,7 +827,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -856,7 +856,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -885,7 +885,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -914,7 +914,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -943,7 +943,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -972,7 +972,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1001,7 +1001,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1030,7 +1030,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1059,7 +1059,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1088,7 +1088,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1117,7 +1117,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1146,7 +1146,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1175,7 +1175,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     }
 ]
diff --git a/test/fixtures/results/quickstart/nist_vpc_management.json b/test/fixtures/results/quickstart/nist_vpc_management.json
index a133e933ad..8d36e2a798 100644
--- a/test/fixtures/results/quickstart/nist_vpc_management.json
+++ b/test/fixtures/results/quickstart/nist_vpc_management.json
@@ -503,7 +503,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -534,7 +534,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -565,7 +565,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -596,7 +596,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -627,7 +627,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -658,7 +658,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -689,7 +689,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -720,7 +720,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -751,7 +751,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -782,7 +782,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -813,7 +813,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -844,7 +844,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -875,7 +875,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -904,7 +904,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -933,7 +933,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     }
 ]
diff --git a/test/fixtures/results/quickstart/nist_vpc_production.json b/test/fixtures/results/quickstart/nist_vpc_production.json
index 6cf84ad246..2459cb532d 100644
--- a/test/fixtures/results/quickstart/nist_vpc_production.json
+++ b/test/fixtures/results/quickstart/nist_vpc_production.json
@@ -54,7 +54,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -84,7 +84,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -113,7 +113,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -142,7 +142,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -172,7 +172,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -202,7 +202,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -231,7 +231,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -260,7 +260,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -290,7 +290,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -320,7 +320,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -349,7 +349,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -378,7 +378,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -408,7 +408,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -438,7 +438,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -467,7 +467,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -496,7 +496,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -526,7 +526,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -556,7 +556,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -585,7 +585,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -614,7 +614,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -644,7 +644,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -674,7 +674,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -703,7 +703,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -732,7 +732,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -762,7 +762,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -792,7 +792,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -821,7 +821,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -850,7 +850,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -880,7 +880,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -910,7 +910,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -939,7 +939,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -968,7 +968,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -998,7 +998,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1028,7 +1028,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1057,7 +1057,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1086,7 +1086,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1116,7 +1116,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1146,7 +1146,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1175,7 +1175,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1204,7 +1204,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1234,7 +1234,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1264,7 +1264,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1293,7 +1293,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1322,7 +1322,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1409,7 +1409,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1440,7 +1440,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1471,7 +1471,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1502,7 +1502,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1533,7 +1533,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1564,7 +1564,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1595,7 +1595,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1626,7 +1626,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1657,7 +1657,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1686,7 +1686,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1715,7 +1715,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     }
 ]
diff --git a/test/fixtures/results/quickstart/openshift.json b/test/fixtures/results/quickstart/openshift.json
index 59b3e047ea..4fc14543a2 100644
--- a/test/fixtures/results/quickstart/openshift.json
+++ b/test/fixtures/results/quickstart/openshift.json
@@ -240,7 +240,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -271,7 +271,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -360,7 +360,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -391,7 +391,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -458,7 +458,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -487,7 +487,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -518,7 +518,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -613,7 +613,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -642,7 +642,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -673,7 +673,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -704,7 +704,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -735,7 +735,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -766,7 +766,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -797,7 +797,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -864,7 +864,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -896,7 +896,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -925,7 +925,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -956,7 +956,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -987,7 +987,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1018,7 +1018,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
@@ -1049,7 +1049,7 @@
             "Description": "Checks resource property values with Primitive Types for values that match those types.",
             "Id": "E3012",
             "ShortDescription": "Check resource properties values",
-            "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype"
+            "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type"
         }
     },
     {
diff --git a/test/integration/test_directives.py b/test/integration/test_directives.py
index d6b76b2bf6..406014ebcc 100644
--- a/test/integration/test_directives.py
+++ b/test/integration/test_directives.py
@@ -50,7 +50,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3002",
                         "ShortDescription": "Resource properties are invalid",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#properties",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#properties",
                     },
                 },
                 {
@@ -82,7 +82,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3002",
                         "ShortDescription": "Resource properties are invalid",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#properties",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#properties",
                     },
                 },
                 {
@@ -147,7 +147,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3002",
                         "ShortDescription": "Resource properties are invalid",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#properties",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#properties",
                     },
                 },
                 {
@@ -180,7 +180,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3030",
                         "ShortDescription": "Check if properties have a valid value",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedvalue",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#enum",
                     },
                 },
             ],
diff --git a/test/integration/test_good_templates.py b/test/integration/test_good_templates.py
index 22ea529824..6f2f496d6c 100644
--- a/test/integration/test_good_templates.py
+++ b/test/integration/test_good_templates.py
@@ -177,7 +177,7 @@ class TestQuickStartTemplates(BaseCliTestCase):
                         ),
                         "Id": "E3012",
                         "ShortDescription": "Check resource properties values",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#valueprimitivetype",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#type",
                     },
                 }
             ],
diff --git a/test/integration/test_mandatory_checks.py b/test/integration/test_mandatory_checks.py
index c17c31c2d8..a119957906 100644
--- a/test/integration/test_mandatory_checks.py
+++ b/test/integration/test_mandatory_checks.py
@@ -44,7 +44,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3002",
                         "ShortDescription": "Resource properties are invalid",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#properties",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#properties",
                     },
                 },
                 {
@@ -72,7 +72,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3002",
                         "ShortDescription": "Resource properties are invalid",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#properties",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#properties",
                     },
                 },
                 {
@@ -129,7 +129,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3002",
                         "ShortDescription": "Resource properties are invalid",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#properties",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#properties",
                     },
                 },
                 {
@@ -158,7 +158,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3030",
                         "ShortDescription": "Check if properties have a valid value",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedvalue",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#enum",
                     },
                 },
                 {
@@ -186,7 +186,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3002",
                         "ShortDescription": "Resource properties are invalid",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#properties",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#properties",
                     },
                 },
                 {
@@ -244,7 +244,7 @@ class TestDirectives(BaseCliTestCase):
                         ),
                         "Id": "E3030",
                         "ShortDescription": "Check if properties have a valid value",
-                        "Source": "https://github.com/aws-cloudformation/cfn-python-lint/blob/main/docs/cfn-resource-specification.md#allowedvalue",
+                        "Source": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#enum",
                     },
                 },
             ],
diff --git a/test/unit/rules/parameters/test_allowed_pattern.py b/test/unit/rules/parameters/test_allowed_pattern.py
index 50f92fa3ed..fdd00de8d9 100644
--- a/test/unit/rules/parameters/test_allowed_pattern.py
+++ b/test/unit/rules/parameters/test_allowed_pattern.py
@@ -8,7 +8,7 @@
 
 from cfnlint.context import Context
 from cfnlint.jsonschema import CfnTemplateValidator
-from cfnlint.rules.parameters.AllowedPattern import AllowedPattern
+from cfnlint.rules.parameters.Pattern import Pattern
 from cfnlint.template.template import Template
 
 
@@ -17,7 +17,7 @@ class TestAllowedPattern(BaseRuleTestCase):
 
     def setUp(self):
         """Setup"""
-        self.rule = AllowedPattern()
+        self.rule = Pattern()
         cfn = Template(
             "test.yaml",
             {
diff --git a/test/unit/rules/parameters/test_allowed_value.py b/test/unit/rules/parameters/test_allowed_value.py
index 86d29f4668..331afb1dac 100644
--- a/test/unit/rules/parameters/test_allowed_value.py
+++ b/test/unit/rules/parameters/test_allowed_value.py
@@ -8,7 +8,7 @@
 
 from cfnlint.context import Context
 from cfnlint.jsonschema import CfnTemplateValidator
-from cfnlint.rules.parameters.AllowedValue import AllowedValue
+from cfnlint.rules.parameters.Enum import Enum
 
 
 class TestAllowedValue(BaseRuleTestCase):
@@ -16,7 +16,7 @@ class TestAllowedValue(BaseRuleTestCase):
 
     def setUp(self):
         """Setup"""
-        self.rule = AllowedValue()
+        self.rule = Enum()
 
     def test_validate(self):
         validator = CfnTemplateValidator(
diff --git a/test/unit/rules/resources/properties/test_enum.py b/test/unit/rules/resources/properties/test_enum.py
index 68fddef80f..92f4abe6d0 100644
--- a/test/unit/rules/resources/properties/test_enum.py
+++ b/test/unit/rules/resources/properties/test_enum.py
@@ -8,14 +8,14 @@
 import pytest
 
 from cfnlint.jsonschema import CfnTemplateValidator
-from cfnlint.rules.parameters.AllowedValue import AllowedValue as ParameterAllowedValue
+from cfnlint.rules.parameters.Enum import Enum as ParameterEnum
 from cfnlint.rules.resources.properties.Enum import Enum
 
 
 @pytest.fixture(scope="module")
 def rule():
     rule = Enum()
-    rule.child_rules["W2030"] = ParameterAllowedValue()
+    rule.child_rules["W2030"] = ParameterEnum()
     yield Enum()
 
 
@@ -44,7 +44,7 @@ def test_validate(rule, validator):
     )
     errs = list(rule.enum(evolved, ["foo"], "bar", {}))
     assert len(errs) == 1
-    assert errs[0].rule.id == ParameterAllowedValue.id
+    assert errs[0].rule.id == ParameterEnum.id
 
     rule.child_rules["W2030"] = None
     errs = list(rule.enum(evolved, ["foo"], "bar", {}))
diff --git a/test/unit/rules/resources/properties/test_min_max.py b/test/unit/rules/resources/properties/test_number_range.py
similarity index 84%
rename from test/unit/rules/resources/properties/test_min_max.py
rename to test/unit/rules/resources/properties/test_number_range.py
index cb10936f71..fee7ce0c5e 100644
--- a/test/unit/rules/resources/properties/test_min_max.py
+++ b/test/unit/rules/resources/properties/test_number_range.py
@@ -8,15 +8,15 @@
 import pytest
 
 from cfnlint.jsonschema import CfnTemplateValidator
-from cfnlint.rules.parameters.NumberSize import NumberSize as ParameterNumberSize
-from cfnlint.rules.resources.properties.MinMax import MinMax
+from cfnlint.rules.parameters.NumberRange import NumberRange as ParamaterNumberRange
+from cfnlint.rules.resources.properties.NumberRange import NumberRange
 
 
 @pytest.fixture
 def rule():
-    rule = MinMax()
-    rule.child_rules["W3034"] = ParameterNumberSize()
-    yield MinMax()
+    rule = NumberRange()
+    rule.child_rules["W3034"] = ParamaterNumberRange()
+    yield NumberRange()
 
 
 @pytest.fixture(scope="module")
@@ -36,7 +36,7 @@ def test_minimum(rule, validator):
     )
     errs = list(rule.minimum(evolved, 1, 0, {}))
     assert len(errs) == 1
-    assert errs[0].rule.id == ParameterNumberSize.id
+    assert errs[0].rule.id == ParamaterNumberRange.id
 
     rule.child_rules["W3034"] = None
     errs = list(rule.minimum(evolved, 1, 0, {}))
@@ -55,7 +55,7 @@ def test_maximum(rule, validator):
     )
     errs = list(rule.maximum(evolved, 1, 2, {}))
     assert len(errs) == 1
-    assert errs[0].rule.id == ParameterNumberSize.id
+    assert errs[0].rule.id == ParamaterNumberRange.id
 
     rule.child_rules["W3034"] = None
     errs = list(rule.maximum(evolved, 1, 2, {}))
@@ -74,7 +74,7 @@ def test_exclusive_minimum(rule, validator):
     )
     errs = list(rule.exclusiveMinimum(evolved, 1, 1, {}))
     assert len(errs) == 1
-    assert errs[0].rule.id == ParameterNumberSize.id
+    assert errs[0].rule.id == ParamaterNumberRange.id
 
     rule.child_rules["W3034"] = None
     errs = list(rule.exclusiveMinimum(evolved, 1, 1, {}))
@@ -93,7 +93,7 @@ def test_exlusive_maximum(rule, validator):
     )
     errs = list(rule.exclusiveMaximum(evolved, 1, 1, {}))
     assert len(errs) == 1
-    assert errs[0].rule.id == ParameterNumberSize.id
+    assert errs[0].rule.id == ParamaterNumberRange.id
 
     rule.child_rules["W3034"] = None
     errs = list(rule.exclusiveMaximum(evolved, 1, 1, {}))
diff --git a/test/unit/rules/resources/properties/test_pattern.py b/test/unit/rules/resources/properties/test_pattern.py
index 249bdba766..c164fa9933 100644
--- a/test/unit/rules/resources/properties/test_pattern.py
+++ b/test/unit/rules/resources/properties/test_pattern.py
@@ -8,16 +8,14 @@
 import pytest
 
 from cfnlint.jsonschema import CfnTemplateValidator
-from cfnlint.rules.parameters.AllowedPattern import (
-    AllowedPattern as ParameterAllowedPattern,
-)
+from cfnlint.rules.parameters.Pattern import Pattern as ParameterPattern
 from cfnlint.rules.resources.properties.Pattern import Pattern
 
 
 @pytest.fixture(scope="module")
 def rule():
     rule = Pattern()
-    rule.child_rules["W2031"] = ParameterAllowedPattern()
+    rule.child_rules["W2031"] = ParameterPattern()
     yield rule
 
 
@@ -46,7 +44,7 @@ def test_validate(rule, validator):
     )
     errs = list(rule.pattern(evolved, "foo", "bar", {}))
     assert len(errs) == 1
-    assert errs[0].rule.id == ParameterAllowedPattern.id
+    assert errs[0].rule.id == ParameterPattern.id
 
     rule.child_rules["W2031"] = None
     errs = list(rule.pattern(evolved, "foo", "bar", {}))
diff --git a/test/unit/rules/resources/properties/test_min_max_length.py b/test/unit/rules/resources/properties/test_string_length.py
similarity index 96%
rename from test/unit/rules/resources/properties/test_min_max_length.py
rename to test/unit/rules/resources/properties/test_string_length.py
index fc517ba49c..e7cd179435 100644
--- a/test/unit/rules/resources/properties/test_min_max_length.py
+++ b/test/unit/rules/resources/properties/test_string_length.py
@@ -8,12 +8,12 @@
 import pytest
 
 from cfnlint.jsonschema import CfnTemplateValidator
-from cfnlint.rules.resources.properties.MinMaxLength import MinMaxLength
+from cfnlint.rules.resources.properties.StringLength import StringLength
 
 
 @pytest.fixture(scope="module")
 def rule():
-    yield MinMaxLength()
+    yield StringLength()
 
 
 @pytest.fixture(scope="module")