diff --git a/analyticshub/lib/Controller/AdminController.php b/analyticshub/lib/Controller/AdminController.php
index d173770..1998671 100644
--- a/analyticshub/lib/Controller/AdminController.php
+++ b/analyticshub/lib/Controller/AdminController.php
@@ -8,7 +8,6 @@ use OCP\IRequest;
 use OCP\IConfig;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
-use OCA\AnalyticsHub\AppInfo\Application;
 
 /**
  * Admin Settings Controller
@@ -32,9 +31,9 @@ class AdminController {
      * Load configuration
      */
     public function load(): JSONResponse {
-        $clientId = $this->config->getAppValue('google_client_id', Application::APP_NAME, '');
-        $apiKey = $this->config->getAppValue('anthropic_api_key', Application::APP_NAME, '');
-        $refreshToken = $this->config->getAppValue('google_refresh_token', Application::APP_NAME, '');
+        $clientId = $this->config->getAppValue('google_client_id', 'analyticshub', '');
+        $apiKey = $this->config->getAppValue('anthropic_api_key', 'analyticshub', '');
+        $refreshToken = $this->config->getAppValue('google_refresh_token', 'analyticshub', '');
 
         // Check if configured
         $isConfigured = !empty($clientId) && !empty($apiKey) && !empty($refreshToken);
@@ -87,14 +86,14 @@ class AdminController {
         }
 
         // Save configuration
-        $this->config->setAppValue('google_client_id', Application::APP_NAME, $clientId);
-        $this->config->setAppValue('google_client_secret', Application::APP_NAME, $clientSecret);
+        $this->config->setAppValue('google_client_id', 'analyticshub', $clientId);
+        $this->config->setAppValue('google_client_secret', 'analyticshub', $clientSecret);
 
         if (!empty($refreshToken)) {
-            $this->config->setAppValue('google_refresh_token', Application::APP_NAME, $refreshToken);
+            $this->config->setAppValue('google_refresh_token', 'analyticshub', $refreshToken);
         }
 
-        $this->config->setAppValue('anthropic_api_key', Application::APP_NAME, $apiKey);
+        $this->config->setAppValue('anthropic_api_key', 'analyticshub', $apiKey);
 
         // Check if fully configured
         $isConfigured = !empty($clientId) && !empty($clientSecret) && !empty($apiKey) && !empty($refreshToken);
diff --git a/analyticshub/lib/Controller/ApiV1Controller.php b/analyticshub/lib/Controller/ApiV1Controller.php
index c4d3112..525f24f 100644
--- a/analyticshub/lib/Controller/ApiV1Controller.php
+++ b/analyticshub/lib/Controller/ApiV1Controller.php
@@ -9,7 +9,6 @@ use OCP\IResponse;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\JSONResponse;
-use OCA\AnalyticsHub\AppInfo\Application;
 
 use OCA\AnalyticsHub\Service\GoogleAnalyticsService;
 use OCA\AnalyticsHub\Service\LLMService;
@@ -147,7 +146,7 @@ class ApiV1Controller {
         $this->validateAgentAccess();
 
         $status = [
-            'app_name' => Application::APP_NAME,
+            'app_name' => 'analyticshub',
             'version' => AppInfo::getVersion(),
             'status' => 'operational',
             'google_analytics' => $this->gaService->isConfigured() ? 'configured' : 'not_configured',
diff --git a/analyticshub/lib/Controller/PageController.php b/analyticshub/lib/Controller/PageController.php
index a39b811..ec5cd21 100644
--- a/analyticshub/lib/Controller/PageController.php
+++ b/analyticshub/lib/Controller/PageController.php
@@ -7,7 +7,6 @@ namespace OCA\AnalyticsHub\Controller;
 use OCP\IRequest;
 use OCP\IConfig;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCA\AnalyticsHub\AppInfo\Application;
 use OCA\AnalyticsHub\Service\GoogleAnalyticsService;
 use OCA\AnalyticsHub\Service\LLMService;
 
@@ -60,8 +59,8 @@ class PageController extends \OCP\AppFramework\Controller {
         }
 
         // Get configuration values (masked for secrets)
-        $clientId = $this->config->getAppValue('google_client_id', Application::APP_NAME, '');
-        $apiKey = $this->config->getAppValue('anthropic_api_key', Application::APP_NAME, '');
+        $clientId = $this->config->getAppValue('google_client_id', 'analyticshub', '');
+        $apiKey = $this->config->getAppValue('anthropic_api_key', 'analyticshub', '');
 
         // Mask API key for display
         $maskedApiKey = '';
@@ -71,7 +70,7 @@ class PageController extends \OCP\AppFramework\Controller {
 
         return new TemplateResponse($this->appName, 'admin', [
             'app_name' => $this->appName,
-            'version' => Application::APP_VERSION,
+            'version' => '1.0.0',
             'status' => 'Ready for development',
             'is_configured' => $isConfigured,
             'is_ga_configured' => $isGAConfigured,
diff --git a/analyticshub/lib/Service/GoogleAnalyticsService.php b/analyticshub/lib/Service/GoogleAnalyticsService.php
index 2cd3284..35fb39c 100644
--- a/analyticshub/lib/Service/GoogleAnalyticsService.php
+++ b/analyticshub/lib/Service/GoogleAnalyticsService.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace OCA\AnalyticsHub\Service;
 
 use OCA\AnalyticsHub\Model\ClientConfig;
-use OCA\AnalyticsHub\AppInfo\Application;
 use OCP\IConfig;
 use OCP\ILogger;
 
@@ -33,9 +32,9 @@ class GoogleAnalyticsService {
      * Check if Google Analytics is configured
      */
     public function isConfigured(): bool {
-        $clientId = $this->config->getAppValue('google_client_id', Application::APP_NAME);
-        $clientSecret = $this->config->getAppValue('google_client_secret', Application::APP_NAME);
-        $refreshToken = $this->config->getAppValue('google_refresh_token', Application::APP_NAME);
+        $clientId = $this->config->getAppValue('google_client_id', 'analyticshub');
+        $clientSecret = $this->config->getAppValue('google_client_secret', 'analyticshub');
+        $refreshToken = $this->config->getAppValue('google_refresh_token', 'analyticshub');
 
         return !empty($clientId) && !empty($clientSecret) && !empty($refreshToken);
     }
@@ -44,7 +43,7 @@ class GoogleAnalyticsService {
      * Check if LLM service is configured
      */
     public function isLLMConfigured(): bool {
-        $apiKey = $this->config->getAppValue('anthropic_api_key', Application::APP_NAME);
+        $apiKey = $this->config->getAppValue('anthropic_api_key', 'analyticshub');
         return !empty($apiKey);
     }
 
@@ -73,7 +72,7 @@ class GoogleAnalyticsService {
      * Get all clients
      */
     private function getClients(): array {
-        $json = $this->config->getAppValue('clients_json', Application::APP_NAME);
+        $json = $this->config->getAppValue('clients_json', 'analyticshub');
         if (empty($json)) {
             return [];
         }
@@ -155,7 +154,7 @@ class GoogleAnalyticsService {
      * Get fresh access token
      */
     private function getFreshAccessToken(): string {
-        $refreshToken = $this->config->getAppValue('google_refresh_token', Application::APP_NAME);
+        $refreshToken = $this->config->getAppValue('google_refresh_token', 'analyticshub');
 
         if (empty($refreshToken)) {
             throw new \Exception('Refresh token not configured');
@@ -188,8 +187,8 @@ class GoogleAnalyticsService {
      * Refresh access token using refresh token
      */
     private function refreshAccessToken(string $refreshToken): ?array {
-        $clientId = $this->config->getAppValue('google_client_id', Application::APP_NAME);
-        $clientSecret = $this->config->getAppValue('google_client_secret', Application::APP_NAME);
+        $clientId = $this->config->getAppValue('google_client_id', 'analyticshub');
+        $clientSecret = $this->config->getAppValue('google_client_secret', 'analyticshub');
 
         $url = self::TOKEN_REFRESH_URL;
         $data = [
diff --git a/analyticshub/lib/Service/LLMService.php b/analyticshub/lib/Service/LLMService.php
index 3d6eda5..6215729 100644
--- a/analyticshub/lib/Service/LLMService.php
+++ b/analyticshub/lib/Service/LLMService.php
@@ -32,7 +32,7 @@ class LLMService {
      * Check if LLM service is configured
      */
     public function isConfigured(): bool {
-        $apiKey = $this->config->getAppValue('anthropic_api_key', Application::APP_NAME);
+        $apiKey = $this->config->getAppValue('anthropic_api_key', 'analyticshub');
         return !empty($apiKey);
     }
 
@@ -43,7 +43,7 @@ class LLMService {
         $this->logger->info("Generating LLM report for: {$client->getName()}");
 
         try {
-            $apiKey = $this->config->getAppValue('anthropic_api_key', Application::APP_NAME);
+            $apiKey = $this->config->getAppValue('anthropic_api_key', 'analyticshub');
 
             if (empty($apiKey)) {
                 throw new \Exception('Anthropic API key not configured');