diff --git a/packages/backend-common/src/database/connectors/mysql.ts b/packages/backend-common/src/database/connectors/mysql.ts
index b75dc3d99c..4283ff42bd 100644
--- a/packages/backend-common/src/database/connectors/mysql.ts
+++ b/packages/backend-common/src/database/connectors/mysql.ts
@@ -115,7 +115,7 @@ export function parseMysqlConnectionString(
       password,
       host: hostname,
       port: Number(port || 3306),
-      database: decodeURIComponent(pathname.substr(1)),
+      database: decodeURIComponent(pathname.substring(1)),
     };
 
     const ssl = searchParams.get('ssl');
diff --git a/packages/backend-common/src/reading/AwsS3UrlReader.test.ts b/packages/backend-common/src/reading/AwsS3UrlReader.test.ts
index 454b8a2c5a..9f81322eec 100644
--- a/packages/backend-common/src/reading/AwsS3UrlReader.test.ts
+++ b/packages/backend-common/src/reading/AwsS3UrlReader.test.ts
@@ -247,7 +247,7 @@ describe('AwsS3UrlReader', () => {
     });
 
     it('returns contents of an object in a bucket', async () => {
-      const response = await reader.read(
+      const response = await reader.readUrl(
         'https://test-bucket.s3.us-east-2.amazonaws.com/awsS3-mock-object.yaml',
       );
       expect(response.toString().trim()).toBe('site_name: Test');
@@ -255,7 +255,7 @@ describe('AwsS3UrlReader', () => {
 
     it('rejects unknown targets', async () => {
       await expect(
-        reader.read(
+        reader.readUrl(
           'https://test-bucket.s3.us-east-2.NOTamazonaws.com/file.yaml',
         ),
       ).rejects.toThrow(
diff --git a/packages/backend-common/src/reading/AzureUrlReader.test.ts b/packages/backend-common/src/reading/AzureUrlReader.test.ts
index bc088d8bc9..0ad1346c3c 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.test.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.test.ts
@@ -116,7 +116,7 @@ describe('AzureUrlReader', () => {
         treeResponseFactory,
       });
 
-      const data = await reader.read(url);
+      const data = await reader.readUrl(url);
       const res = await JSON.parse(data.toString('utf-8'));
       expect(res).toEqual(response);
     });
@@ -145,7 +145,7 @@ describe('AzureUrlReader', () => {
           logger,
           treeResponseFactory,
         });
-        await reader.read(url);
+        await reader.readUrl(url);
       }).rejects.toThrow(error);
     });
   });
diff --git a/packages/backend-common/src/reading/BitbucketCloudUrlReader.test.ts b/packages/backend-common/src/reading/BitbucketCloudUrlReader.test.ts
index 12ace2755b..ca6e15a005 100644
--- a/packages/backend-common/src/reading/BitbucketCloudUrlReader.test.ts
+++ b/packages/backend-common/src/reading/BitbucketCloudUrlReader.test.ts
@@ -161,7 +161,7 @@ describe('BitbucketCloudUrlReader', () => {
   describe('read', () => {
     it('rejects unknown targets', async () => {
       await expect(
-        reader.read('https://not.bitbucket.com/apa'),
+        reader.readUrl('https://not.bitbucket.com/apa'),
       ).rejects.toThrow(
         'Incorrect URL: https://not.bitbucket.com/apa, Error: Invalid Bitbucket Cloud URL or file path',
       );
diff --git a/packages/backend-common/src/reading/BitbucketUrlReader.test.ts b/packages/backend-common/src/reading/BitbucketUrlReader.test.ts
index 922480f8e7..c18e779592 100644
--- a/packages/backend-common/src/reading/BitbucketUrlReader.test.ts
+++ b/packages/backend-common/src/reading/BitbucketUrlReader.test.ts
@@ -16,8 +16,8 @@
 
 import { ConfigReader } from '@backstage/config';
 import {
-  BitbucketIntegration,
-  readBitbucketIntegrationConfig,
+  BitbucketCloudIntegration,
+  readBitbucketCloudIntegrationConfig
 } from '@backstage/integration';
 import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
 import fs from 'fs-extra';
@@ -27,14 +27,14 @@ import { setupServer } from 'msw/node';
 import os from 'os';
 import path from 'path';
 import { NotModifiedError } from '@backstage/errors';
-import { BitbucketUrlReader } from './BitbucketUrlReader';
+import { BitbucketCloudUrlReader } from './BitbucketCloudUrlReader';
 import { DefaultReadTreeResponseFactory } from './tree';
 import { getVoidLogger } from '../logging';
 import getRawBody from 'raw-body';
 
 const logger = getVoidLogger();
 
-describe('BitbucketUrlReader.factory', () => {
+describe('BitbucketCloudUrlReader.factory', () => {
   it('only apply integration configs not inherited from bitbucketCloud or bitbucketServer', () => {
     const config = new ConfigReader({
       integrations: {
@@ -57,7 +57,7 @@ describe('BitbucketUrlReader.factory', () => {
       config: config,
     });
 
-    const tuples = BitbucketUrlReader.factory({
+    const tuples = BitbucketCloudUrlReader.factory({
       config,
       logger,
       treeResponseFactory,
@@ -67,34 +67,32 @@ describe('BitbucketUrlReader.factory', () => {
   });
 });
 
-describe('BitbucketUrlReader', () => {
+describe('BitbucketCloudUrlReader', () => {
   const treeResponseFactory = DefaultReadTreeResponseFactory.create({
     config: new ConfigReader({}),
   });
 
-  const bitbucketProcessor = new BitbucketUrlReader(
-    new BitbucketIntegration(
-      readBitbucketIntegrationConfig(
+  const bitbucketProcessor = new BitbucketCloudUrlReader(
+    new BitbucketCloudIntegration(
+      readBitbucketCloudIntegrationConfig(
         new ConfigReader({
           host: 'bitbucket.org',
           apiBaseUrl: 'https://api.bitbucket.org/2.0',
         }),
       ),
     ),
-    logger,
     { treeResponseFactory },
   );
 
-  const hostedBitbucketProcessor = new BitbucketUrlReader(
-    new BitbucketIntegration(
-      readBitbucketIntegrationConfig(
+  const hostedBitbucketProcessor = new BitbucketCloudUrlReader(
+    new BitbucketCloudIntegration(
+      readBitbucketCloudIntegrationConfig(
         new ConfigReader({
           host: 'bitbucket.mycompany.net',
           apiBaseUrl: 'https://api.bitbucket.mycompany.net/rest/api/1.0',
         }),
       ),
     ),
-    logger,
     { treeResponseFactory },
   );
 
@@ -209,7 +207,7 @@ describe('BitbucketUrlReader', () => {
   describe('read', () => {
     it('rejects unknown targets', async () => {
       await expect(
-        bitbucketProcessor.read('https://not.bitbucket.com/apa'),
+        bitbucketProcessor.readUrl('https://not.bitbucket.com/apa'),
       ).rejects.toThrow(
         'Incorrect URL: https://not.bitbucket.com/apa, Error: Invalid Bitbucket URL or file path',
       );