diff --git a/integration/resources/templates/combination/function_with_mq.yaml b/integration/resources/templates/combination/function_with_mq.yaml
index b8fc91986..d9bc1e989 100644
--- a/integration/resources/templates/combination/function_with_mq.yaml
+++ b/integration/resources/templates/combination/function_with_mq.yaml
@@ -60,23 +60,23 @@ Resources:
       - IpProtocol: tcp
         FromPort: 8162
         ToPort: 8162
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
       - IpProtocol: tcp
         FromPort: 61617
         ToPort: 61617
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
       - IpProtocol: tcp
         FromPort: 5671
         ToPort: 5671
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
       - IpProtocol: tcp
         FromPort: 61614
         ToPort: 61614
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
       - IpProtocol: tcp
         FromPort: 8883
         ToPort: 8883
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
 
   MyLambdaExecutionRole:
     Type: AWS::IAM::Role
diff --git a/integration/resources/templates/combination/function_with_mq_using_autogen_role.yaml b/integration/resources/templates/combination/function_with_mq_using_autogen_role.yaml
index ba15f1f41..394578465 100644
--- a/integration/resources/templates/combination/function_with_mq_using_autogen_role.yaml
+++ b/integration/resources/templates/combination/function_with_mq_using_autogen_role.yaml
@@ -60,23 +60,23 @@ Resources:
       - IpProtocol: tcp
         FromPort: 8162
         ToPort: 8162
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
       - IpProtocol: tcp
         FromPort: 61617
         ToPort: 61617
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
       - IpProtocol: tcp
         FromPort: 5671
         ToPort: 5671
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
       - IpProtocol: tcp
         FromPort: 61614
         ToPort: 61614
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
       - IpProtocol: tcp
         FromPort: 8883
         ToPort: 8883
-        CidrIp: 0.0.0.0/0
+        CidrIp: 10.0.0.0/16
 
   MyMqBroker:
     Properties:
diff --git a/tests/translator/input/graphqlapi_function_by_id.yaml b/tests/translator/input/graphqlapi_function_by_id.yaml
index d089338e6..99cd3e5c9 100644
--- a/tests/translator/input/graphqlapi_function_by_id.yaml
+++ b/tests/translator/input/graphqlapi_function_by_id.yaml
@@ -19,7 +19,7 @@ Resources:
     Properties:
       ApiId: !GetAtt SuperCoolAPI.ApiId
       Code: this is my epic code
-      DataSourceName: some-cool-datasource
+      DataSourceName: someCoolDataSource
       Name: MyFunction
       Runtime:
         Name: APPSYNC_JS
diff --git a/tests/translator/output/aws-cn/graphqlapi_function_by_id.json b/tests/translator/output/aws-cn/graphqlapi_function_by_id.json
index 678cbf2bf..089e63898 100644
--- a/tests/translator/output/aws-cn/graphqlapi_function_by_id.json
+++ b/tests/translator/output/aws-cn/graphqlapi_function_by_id.json
@@ -9,7 +9,7 @@
           ]
         },
         "Code": "this is my epic code",
-        "DataSourceName": "some-cool-datasource",
+        "DataSourceName": "someCoolDataSource",
         "Name": "MyFunction",
         "Runtime": {
           "Name": "APPSYNC_JS",
diff --git a/tests/translator/output/aws-us-gov/graphqlapi_function_by_id.json b/tests/translator/output/aws-us-gov/graphqlapi_function_by_id.json
index 678cbf2bf..089e63898 100644
--- a/tests/translator/output/aws-us-gov/graphqlapi_function_by_id.json
+++ b/tests/translator/output/aws-us-gov/graphqlapi_function_by_id.json
@@ -9,7 +9,7 @@
           ]
         },
         "Code": "this is my epic code",
-        "DataSourceName": "some-cool-datasource",
+        "DataSourceName": "someCoolDataSource",
         "Name": "MyFunction",
         "Runtime": {
           "Name": "APPSYNC_JS",
diff --git a/tests/translator/output/graphqlapi_function_by_id.json b/tests/translator/output/graphqlapi_function_by_id.json
index 678cbf2bf..089e63898 100644
--- a/tests/translator/output/graphqlapi_function_by_id.json
+++ b/tests/translator/output/graphqlapi_function_by_id.json
@@ -9,7 +9,7 @@
           ]
         },
         "Code": "this is my epic code",
-        "DataSourceName": "some-cool-datasource",
+        "DataSourceName": "someCoolDataSource",
         "Name": "MyFunction",
         "Runtime": {
           "Name": "APPSYNC_JS",