diff --git a/src/steps/cloud-sql/constants.ts b/src/steps/cloud-sql/constants.ts
index e11530f7..03250363 100644
--- a/src/steps/cloud-sql/constants.ts
+++ b/src/steps/cloud-sql/constants.ts
@@ -29,12 +29,12 @@ export const ENTITY_CLASS_CLOUD_SQL_CONNECTION = 'Network';
 export const STEP_GOOGLE_CLOUD_PROJECT_HAS_CLOUD_SQL =
   'fetch-project-has-sql';
 export const RELATIONSHIP_TYPE_CLOUD_PROJECT_HAS_CLOUD_SQL =
-  'google_cloud_project_has_sql'; // done 
+  'google_cloud_project_has_sql';
 
 export const STEP_CLOUD_SQL_HAS_CLOUD_SQL_INSTANCES =
   'fetch-cloud-sql-has-sql-instances';
 export const RELATIONSHIP_TYPE_CLOUD_SQL_HAS_CLOUD_SQL_INSTANCES =
-  'google_cloud_sql_has_sql_instance';// done 
+  'google_cloud_sql_has_sql_instance';
 
 export const STEP_CLOUD_SQL_SSL_CERTIFICATION_HAS_CLOUD_SQL_BACKUP =
   'fetch-cloud-sql-ssl-certification-has-sql-backup';
@@ -47,7 +47,7 @@ export const RELATIONSHIP_TYPE_CLOUD_SQL_INSTANCES_HAS_CLOUD_SQL_BACKUP =
   'google_cloud_sql_instance_has_sql_backup';
 
 export const STEP_CLOUD_SQL_INSTANCES_USES_CLOUD_SQL_SSL_CERTIFICATION =
-  'fetch-cloud-sql-instances-has-sql-ssl-certification';
+  'fetch-cloud-sql-instances-uses-sql-ssl-certification';
 export const RELATIONSHIP_TYPE_CLOUD_SQL_INSTANCES_USES_CLOUD_SQL_SSL_CERTIFICATION =
   'google_cloud_sql_instance_uses_ssl_certificate';
 
@@ -57,14 +57,14 @@ export const RELATIONSHIP_TYPE_CLOUD_SQL_INSTANCES_HAS_CLOUD_SQL_CONNECTION =
   'google_cloud_sql_instance_has_connection';
 
 export const STEP_CLOUD_SQL_INSTANCES_USES_CLOUD_SQL_DATABASE =
-  'fetch-cloud-sql-instances-has-sql-database';
+  'fetch-cloud-sql-instances-uses-sql-database';
 export const RELATIONSHIP_TYPE_CLOUD_SQL_INSTANCES_USES_CLOUD_SQL_DATABASE =
-  'google_cloud_sql_instance_has_sql_database';
+  'google_cloud_sql_instance_uses_database';
 
 export const STEP_CLOUD_SQL_INSTANCES_ASSIGNED_GOOGLE_USER =
   'fetch-cloud-sql-instances-assigned-google-user';
 export const RELATIONSHIP_TYPE_CLOUD_SQL_INSTANCES_ASSIGNED_GOOGLE_USER =
-  'google_cloud_sql_instance_assigned_google_user';
+  'google_cloud_sql_instance_assigned_user';
 
 export const STEP_CLOUD_SQL_HAS_CLOUD_SQL_DATABASE =
   'fetch-cloud-sql-has-sql-database';
diff --git a/src/steps/cloud-sql/index.ts b/src/steps/cloud-sql/index.ts
index c6e7f995..432e210d 100644
--- a/src/steps/cloud-sql/index.ts
+++ b/src/steps/cloud-sql/index.ts
@@ -470,7 +470,7 @@ export async function buildSqlHasSqldatabaseRelationship(
       }
       await jobState.addRelationship(
         createDirectRelationship({
-          _class: RelationshipClass.ASSIGNED,
+          _class: RelationshipClass.HAS,
           fromKey: sqlEntityKey as string,
           fromType: ENTITY_TYPE_CLOUD_SQL,
           toKey: sqlDatabseEntity._key as string,
@@ -690,7 +690,7 @@ export const cloudSqlSteps: GoogleCloudIntegrationStep[] = [
     entities: [],
     relationships: [
       {
-        _class: RelationshipClass.HAS,
+        _class: RelationshipClass.USES,
         _type: RELATIONSHIP_TYPE_CLOUD_SQL_INSTANCES_USES_CLOUD_SQL_SSL_CERTIFICATION,
         sourceType: ENTITY_TYPE_CLOUD_SQL_INSTANCES,
         targetType: ENTITY_TYPE_CLOUD_SQL_SSL_CERTIFICATION,