diff --git a/cortex-js/src/infrastructure/commanders/models/model-pull.command.ts b/cortex-js/src/infrastructure/commanders/models/model-pull.command.ts
index 08dbeee6f..c667389c5 100644
--- a/cortex-js/src/infrastructure/commanders/models/model-pull.command.ts
+++ b/cortex-js/src/infrastructure/commanders/models/model-pull.command.ts
@@ -16,7 +16,7 @@ import { checkModelCompatibility } from '@/utils/model-check';
   arguments: '<model_id>',
   argsDescription: { model_id: 'Model repo to pull' },
   description:
-    'Download a model from a registry. Working with HuggingFace repositories. For available models, please visit https://huggingface.co/cortexhub',
+    'Download a model from a registry. Working with HuggingFace repositories. For available models, please visit https://huggingface.co/cortexso',
 })
 @SetCommandContext()
 export class ModelPullCommand extends CommandRunner {
diff --git a/cortex-js/src/infrastructure/commanders/shortcuts/run.command.ts b/cortex-js/src/infrastructure/commanders/shortcuts/run.command.ts
index 571ef0b18..e908eef8c 100644
--- a/cortex-js/src/infrastructure/commanders/shortcuts/run.command.ts
+++ b/cortex-js/src/infrastructure/commanders/shortcuts/run.command.ts
@@ -57,7 +57,7 @@ export class RunCommand extends CommandRunner {
     // Try Pull
     if (!(await this.modelsCliUsecases.getModel(modelId))) {
       console.log(
-        `${modelId} not found on filesystem. Downloading from remote: https://huggingface.co/cortexhub if possible.`,
+        `${modelId} not found on filesystem. Downloading from remote: https://huggingface.co/cortexso if possible.`,
       );
       await this.modelsCliUsecases.pullModel(modelId).catch((e: Error) => {
         if (e instanceof ModelNotFoundException)
diff --git a/cortex-js/src/infrastructure/commanders/usecases/benchmark.cli.usecases.ts b/cortex-js/src/infrastructure/commanders/usecases/benchmark.cli.usecases.ts
index db6b7fe90..849357188 100644
--- a/cortex-js/src/infrastructure/commanders/usecases/benchmark.cli.usecases.ts
+++ b/cortex-js/src/infrastructure/commanders/usecases/benchmark.cli.usecases.ts
@@ -42,7 +42,6 @@ export class BenchmarkCliUsecases {
       };
 
       const model = params?.model ?? this.config.api.parameters.model;
-      // TODO: Using OpenAI client or Cortex client to benchmark?
       this.cortexClient = new Cortex({
         apiKey: this.config.api.api_key,
         baseURL: this.config.api.base_url,
diff --git a/cortex-js/src/infrastructure/constants/huggingface.ts b/cortex-js/src/infrastructure/constants/huggingface.ts
index 893a26b61..6f4a2bbe1 100644
--- a/cortex-js/src/infrastructure/constants/huggingface.ts
+++ b/cortex-js/src/infrastructure/constants/huggingface.ts
@@ -2,7 +2,7 @@ export const HUGGING_FACE_TREE_REF_URL = (
   repo: string,
   tree: string,
   path: string,
-) => `https://huggingface.co/cortexhub/${repo}/resolve/${tree}/${path}`;
+) => `https://huggingface.co/cortexso/${repo}/resolve/${tree}/${path}`;
 
 export const HUGGING_FACE_DOWNLOAD_FILE_MAIN_URL = (
   modelId: string,
diff --git a/cortex-js/src/utils/huggingface.ts b/cortex-js/src/utils/huggingface.ts
index eb7b2db09..dbdc8b643 100644
--- a/cortex-js/src/utils/huggingface.ts
+++ b/cortex-js/src/utils/huggingface.ts
@@ -119,7 +119,7 @@ export async function fetchJanRepoData(
     modelId.split(':')[1] ?? !modelId.includes('/') ? 'default' : '',
   );
   const url = getRepoModelsUrl(
-    `${!modelId.includes('/') ? 'cortexhub/' : ''}${repo}`,
+    `${!modelId.includes('/') ? 'cortexso/' : ''}${repo}`,
     tree,
   );
 
@@ -165,7 +165,7 @@ export async function fetchJanRepoData(
     tags: ['gguf'],
     id: modelId,
     modelId: modelId,
-    author: 'cortexhub',
+    author: 'cortexso',
     sha: '',
     downloads: 0,
     lastModified: '',