diff --git a/pkg/parsers/properties/InstanceBlockDeviceMapping.go b/pkg/parsers/properties/InstanceBlockDeviceMapping.go
index 3a30b722..f0661a18 100644
--- a/pkg/parsers/properties/InstanceBlockDeviceMapping.go
+++ b/pkg/parsers/properties/InstanceBlockDeviceMapping.go
@@ -3,22 +3,17 @@ package properties
 // Code generated by go generate; DO NOT EDIT.
 // It's generated by "github.com/KablamoOSS/kombustion/generate"
 
-import "fmt"
-
-// InstanceBlockDeviceMapping Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html
+// InstanceBlockDeviceMapping Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html
 type InstanceBlockDeviceMapping struct {
-	DeviceName  interface{}       `yaml:"DeviceName"`
-	VirtualName interface{}       `yaml:"VirtualName,omitempty"`
-	NoDevice    *InstanceNoDevice `yaml:"NoDevice,omitempty"`
-	Ebs         *InstanceEbs      `yaml:"Ebs,omitempty"`
+	DeviceName  interface{}             `yaml:"DeviceName,omitempty"`
+	NoDevice    interface{}             `yaml:"NoDevice,omitempty"`
+	VirtualName interface{}             `yaml:"VirtualName,omitempty"`
+	Ebs         *InstanceEbsBlockDevice `yaml:"Ebs,omitempty"`
 }
 
 // InstanceBlockDeviceMapping validation
 func (resource InstanceBlockDeviceMapping) Validate() []error {
 	errors := []error{}
 
-	if resource.DeviceName == nil {
-		errors = append(errors, fmt.Errorf("Missing required field 'DeviceName'"))
-	}
 	return errors
 }
diff --git a/pkg/parsers/properties/ScalingPolicyMetricDimension.go b/pkg/parsers/properties/ScalingPolicyMetricDimension.go
index f49936f9..f84ce13f 100644
--- a/pkg/parsers/properties/ScalingPolicyMetricDimension.go
+++ b/pkg/parsers/properties/ScalingPolicyMetricDimension.go
@@ -5,7 +5,7 @@ package properties
 
 import "fmt"
 
-// ScalingPolicyMetricDimension Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-metricdimension.html
+// ScalingPolicyMetricDimension Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-metricdimension.html
 type ScalingPolicyMetricDimension struct {
 	Name  interface{} `yaml:"Name"`
 	Value interface{} `yaml:"Value"`
diff --git a/pkg/parsers/properties/ScalingPolicyPredefinedMetricSpecification.go b/pkg/parsers/properties/ScalingPolicyPredefinedMetricSpecification.go
index 28295266..b6a9e35b 100644
--- a/pkg/parsers/properties/ScalingPolicyPredefinedMetricSpecification.go
+++ b/pkg/parsers/properties/ScalingPolicyPredefinedMetricSpecification.go
@@ -5,7 +5,7 @@ package properties
 
 import "fmt"
 
-// ScalingPolicyPredefinedMetricSpecification Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-predefinedmetricspecification.html
+// ScalingPolicyPredefinedMetricSpecification Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predefinedmetricspecification.html
 type ScalingPolicyPredefinedMetricSpecification struct {
 	PredefinedMetricType interface{} `yaml:"PredefinedMetricType"`
 	ResourceLabel        interface{} `yaml:"ResourceLabel,omitempty"`
diff --git a/pkg/parsers/properties/ScalingPolicyStepAdjustment.go b/pkg/parsers/properties/ScalingPolicyStepAdjustment.go
index df0ea74d..d3cafacd 100644
--- a/pkg/parsers/properties/ScalingPolicyStepAdjustment.go
+++ b/pkg/parsers/properties/ScalingPolicyStepAdjustment.go
@@ -5,7 +5,7 @@ package properties
 
 import "fmt"
 
-// ScalingPolicyStepAdjustment Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment.html
+// ScalingPolicyStepAdjustment Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-stepadjustments.html
 type ScalingPolicyStepAdjustment struct {
 	MetricIntervalLowerBound interface{} `yaml:"MetricIntervalLowerBound,omitempty"`
 	MetricIntervalUpperBound interface{} `yaml:"MetricIntervalUpperBound,omitempty"`
diff --git a/pkg/parsers/properties/XssMatchSetFieldToMatch.go b/pkg/parsers/properties/XssMatchSetFieldToMatch.go
index e0d4d13a..960c1041 100644
--- a/pkg/parsers/properties/XssMatchSetFieldToMatch.go
+++ b/pkg/parsers/properties/XssMatchSetFieldToMatch.go
@@ -5,7 +5,7 @@ package properties
 
 import "fmt"
 
-// XssMatchSetFieldToMatch Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple-fieldtomatch.html
+// XssMatchSetFieldToMatch Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-fieldtomatch.html
 type XssMatchSetFieldToMatch struct {
 	Data interface{} `yaml:"Data,omitempty"`
 	Type interface{} `yaml:"Type"`
diff --git a/pkg/parsers/properties/XssMatchSetXssMatchTuple.go b/pkg/parsers/properties/XssMatchSetXssMatchTuple.go
index f5486474..0ddca820 100644
--- a/pkg/parsers/properties/XssMatchSetXssMatchTuple.go
+++ b/pkg/parsers/properties/XssMatchSetXssMatchTuple.go
@@ -5,7 +5,7 @@ package properties
 
 import "fmt"
 
-// XssMatchSetXssMatchTuple Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-xssmatchtuple.html
+// XssMatchSetXssMatchTuple Documentation: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple.html
 type XssMatchSetXssMatchTuple struct {
 	TextTransformation interface{}              `yaml:"TextTransformation"`
 	FieldToMatch       *XssMatchSetFieldToMatch `yaml:"FieldToMatch"`
diff --git a/pkg/parsers/resources/EC2-VPCEndpoint.go b/pkg/parsers/resources/EC2-VPCEndpoint.go
index 387f0575..93388919 100644
--- a/pkg/parsers/resources/EC2-VPCEndpoint.go
+++ b/pkg/parsers/resources/EC2-VPCEndpoint.go
@@ -23,7 +23,7 @@ type EC2VPCEndpointProperties struct {
 	PolicyDocument    interface{} `yaml:"PolicyDocument,omitempty"`
 	PrivateDnsEnabled interface{} `yaml:"PrivateDnsEnabled,omitempty"`
 	ServiceName       interface{} `yaml:"ServiceName"`
-	VPCEndpointType   interface{} `yaml:"VPCEndpointType,omitempty"`
+	VpcEndpointType   interface{} `yaml:"VpcEndpointType,omitempty"`
 	VpcId             interface{} `yaml:"VpcId"`
 	RouteTableIds     interface{} `yaml:"RouteTableIds,omitempty"`
 	SecurityGroupIds  interface{} `yaml:"SecurityGroupIds,omitempty"`