diff --git a/src/backend/common/vendor/RockSkyApiClient.ts b/src/backend/common/vendor/RockSkyApiClient.ts
index 275ed6d0..31892491 100644
--- a/src/backend/common/vendor/RockSkyApiClient.ts
+++ b/src/backend/common/vendor/RockSkyApiClient.ts
@@ -12,7 +12,7 @@ import { ListenPayload, ListenResponse, ListenType, SubmitPayload } from './list
 import { playToListenPayload } from './listenbrainz/lzUtils.js';
 import { RockskyScrobble } from './rocksky/interfaces.js';
 import { Handle } from "@atcute/lexicons";
-import { identifierToAtProtoHandle } from './bluesky/bsUtils.js';
+import { identifierToAtProtoHandle } from './atproto/atUtils.js';
 import { baseFormatPlayObj } from "../../utils/PlayTransformUtils.js";
 import { ScrobbleSubmitError } from "../errors/MSErrors.js";
 import { tryApiCall } from "../../utils/RequestUtils.js";
diff --git a/src/backend/common/vendor/bluesky/BlueSkyAppApiClient.ts b/src/backend/common/vendor/atproto/ATProtoAppApiClient.ts
similarity index 97%
rename from src/backend/common/vendor/bluesky/BlueSkyAppApiClient.ts
rename to src/backend/common/vendor/atproto/ATProtoAppApiClient.ts
index 686bf75b..6f33c9d0 100644
--- a/src/backend/common/vendor/bluesky/BlueSkyAppApiClient.ts
+++ b/src/backend/common/vendor/atproto/ATProtoAppApiClient.ts
@@ -1,7 +1,7 @@
 import { AbstractApiOptions } from "../../infrastructure/Atomic.js";
 import { TealClientData } from "../../infrastructure/config/client/tealfm.js";
 import { Agent, CredentialSession, AtpSessionEvent, AtpSessionData } from "@atproto/api";
-import { AbstractBlueSkyApiClient } from "./AbstractBlueSkyApiClient.js";
+import { AbstractBlueSkyApiClient } from "./AbstractATProtoApiClient.js";
 import { isPortReachableConnect, normalizeWebAddress } from "../../../utils/NetworkUtils.js";
 import { URLData } from "../../../../core/Atomic.js";
 import { isNodeNetworkException } from "../../errors/NodeErrors.js";
@@ -14,7 +14,7 @@ import {
   WellKnownHandleResolver,
 } from "@atcute/identity-resolver";
 import { AtprotoDid, DidDocument } from "@atproto/oauth-client-node";
-import { identifierToAtProtoHandle, isDID } from "./bsUtils.js";
+import { identifierToAtProtoHandle, isDID } from "./atUtils.js";
 
 interface HandleData {
     did: string
diff --git a/src/backend/common/vendor/bluesky/BlueSkyOauthApiClient.ts b/src/backend/common/vendor/atproto/ATProtoOauthApiClient.ts
similarity index 98%
rename from src/backend/common/vendor/bluesky/BlueSkyOauthApiClient.ts
rename to src/backend/common/vendor/atproto/ATProtoOauthApiClient.ts
index 6d31dd44..6245e409 100644
--- a/src/backend/common/vendor/bluesky/BlueSkyOauthApiClient.ts
+++ b/src/backend/common/vendor/atproto/ATProtoOauthApiClient.ts
@@ -8,7 +8,7 @@ import {
     OAuthSession,
 } from "@atproto/oauth-client-node";
 import { Agent } from "@atproto/api";
-import { AbstractBlueSkyApiClient } from "./AbstractBlueSkyApiClient.js";
+import { AbstractBlueSkyApiClient } from "./AbstractATProtoApiClient.js";
 
 
 export class BlueSkyOauthApiClient extends AbstractBlueSkyApiClient {
diff --git a/src/backend/common/vendor/bluesky/AbstractBlueSkyApiClient.ts b/src/backend/common/vendor/atproto/AbstractATProtoApiClient.ts
similarity index 100%
rename from src/backend/common/vendor/bluesky/AbstractBlueSkyApiClient.ts
rename to src/backend/common/vendor/atproto/AbstractATProtoApiClient.ts
diff --git a/src/backend/common/vendor/bluesky/bsUtils.ts b/src/backend/common/vendor/atproto/atUtils.ts
similarity index 100%
rename from src/backend/common/vendor/bluesky/bsUtils.ts
rename to src/backend/common/vendor/atproto/atUtils.ts
diff --git a/src/backend/scrobblers/TealfmScrobbler.ts b/src/backend/scrobblers/TealfmScrobbler.ts
index c94ffc65..b30413c4 100644
--- a/src/backend/scrobblers/TealfmScrobbler.ts
+++ b/src/backend/scrobblers/TealfmScrobbler.ts
@@ -14,9 +14,9 @@ import { Notifiers } from "../notifier/Notifiers.js";
 
 import { nowPlayingUpdateByPlayDuration, shouldClearNPStatus } from "./AbstractScrobbleClient.js";
 import { TealClientConfig } from "../common/infrastructure/config/client/tealfm.js";
-import { BlueSkyAppApiClient } from "../common/vendor/bluesky/BlueSkyAppApiClient.js";
-import { BlueSkyOauthApiClient } from "../common/vendor/bluesky/BlueSkyOauthApiClient.js";
-import { AbstractBlueSkyApiClient, nowPlayingExpirationDuration, playToRecord, playToStatusRecord, recordToPlay } from "../common/vendor/bluesky/AbstractBlueSkyApiClient.js";
+import { BlueSkyAppApiClient } from "../common/vendor/atproto/ATProtoAppApiClient.js";
+import { BlueSkyOauthApiClient } from "../common/vendor/atproto/ATProtoOauthApiClient.js";
+import { AbstractBlueSkyApiClient, nowPlayingExpirationDuration, playToRecord, playToStatusRecord, recordToPlay } from "../common/vendor/atproto/AbstractATProtoApiClient.js";
 import dayjs, { Dayjs } from "dayjs";
 import { durationToHuman, isDebugMode } from "../utils.js";
 import AbstractHistoricalScrobbleClient from "./AbstractHistoricalScrobbleClient.js";
diff --git a/src/backend/server/auth.ts b/src/backend/server/auth.ts
index 2b706363..f31bccc0 100644
--- a/src/backend/server/auth.ts
+++ b/src/backend/server/auth.ts
@@ -12,7 +12,7 @@ import { sortAndDeduplicateDiagnostics } from "typescript";
 import { source } from "common-tags";
 import TealScrobbler from "../scrobblers/TealfmScrobbler.js";
 import { parseRegexSingle } from "@foxxmd/regex-buddy-core";
-import { BlueSkyOauthApiClient } from "../common/vendor/bluesky/BlueSkyOauthApiClient.js";
+import { BlueSkyOauthApiClient } from "../common/vendor/atproto/ATProtoOauthApiClient.js";
 import LibrefmScrobbler from "../scrobblers/LibrefmScrobbler.js";
 import LibrefmSource from "../sources/LibrefmSource.js";
 import e from "express";
diff --git a/src/backend/sources/TealfmSource.ts b/src/backend/sources/TealfmSource.ts
index 21bf09b7..d38fd1b0 100644
--- a/src/backend/sources/TealfmSource.ts
+++ b/src/backend/sources/TealfmSource.ts
@@ -4,10 +4,10 @@ import { isNodeNetworkException } from "../common/errors/NodeErrors.js";
 import { FormatPlayObjectOptions, InternalConfig } from "../common/infrastructure/Atomic.js";
 import { RecentlyPlayedOptions } from "./AbstractSource.js";
 import MemorySource from "./MemorySource.js";
-import { AbstractBlueSkyApiClient, listRecordToPlay, recordToPlay } from "../common/vendor/bluesky/AbstractBlueSkyApiClient.js";
+import { AbstractBlueSkyApiClient, listRecordToPlay, recordToPlay } from "../common/vendor/atproto/AbstractATProtoApiClient.js";
 import { TealSourceConfig } from "../common/infrastructure/config/source/tealfm.js";
-import { BlueSkyAppApiClient } from "../common/vendor/bluesky/BlueSkyAppApiClient.js";
-import { BlueSkyOauthApiClient } from "../common/vendor/bluesky/BlueSkyOauthApiClient.js";
+import { BlueSkyAppApiClient } from "../common/vendor/atproto/ATProtoAppApiClient.js";
+import { BlueSkyOauthApiClient } from "../common/vendor/atproto/ATProtoOauthApiClient.js";
 import { parseArrayFromMaybeString } from "../utils/StringUtils.js";
 
 export default class TealfmSource extends MemorySource {
diff --git a/src/backend/tests/tealfm/tealfm.test.ts b/src/backend/tests/tealfm/tealfm.test.ts
index fcbaf827..162c276a 100644
--- a/src/backend/tests/tealfm/tealfm.test.ts
+++ b/src/backend/tests/tealfm/tealfm.test.ts
@@ -2,7 +2,7 @@ import chai, { expect } from 'chai';
 import asPromised from 'chai-as-promised';
 import { after, before, describe, it } from 'mocha';
 import { generateArtistCredits, generatePlay, generateTealPlayRecord, withBrainz } from "../../../core/PlayTestUtils.js";
-import { listRecordToPlay, playToRecord } from '../../common/vendor/bluesky/AbstractBlueSkyApiClient.js';
+import { listRecordToPlay, playToRecord } from '../../common/vendor/atproto/AbstractATProtoApiClient.js';
 import dayjs from 'dayjs';
 import { artistCreditsToNames } from '../../../core/StringUtils.js';
 import TealScrobbler from '../../scrobblers/TealfmScrobbler.js';