diff --git a/backend/LICENSE b/backend/LICENSE
index 0e8b963..913b251 100644
--- a/backend/LICENSE
+++ b/backend/LICENSE
@@ -1,3 +1,3 @@
-This package is part of the Bamort monorepo and is licensed under the PolyForm Noncommercial License 1.0.0.
+This package is part of the BaMoRT monorepo and is licensed under the PolyForm Noncommercial License 1.0.0.
 
 See ../LICENSE
diff --git a/backend/character/handlers.go b/backend/character/handlers.go
index 9ab7bcf..0a38fc6 100644
--- a/backend/character/handlers.go
+++ b/backend/character/handlers.go
@@ -224,7 +224,7 @@ func GetCharacterExperienceAndWealth(c *gin.Context) {
 	}
 
 	// Berechne Gesamtvermögen in Silbergroschen
-	// Annahme: 1 GS = 10 SS, 1 SS = 10 KS (typische Midgard Währung)
+	// Annahme: 1 GS = 10 SS, 1 SS = 10 KS (typische PRG Währung)
 	gs := character.Vermoegen.Goldstuecke
 	ss := character.Vermoegen.Silberstuecke
 	ks := character.Vermoegen.Kupferstuecke
@@ -1750,7 +1750,7 @@ func getSpellLECost(level int) int {
 	// Query the database for the LE cost for this level
 	err := database.DB.Where("level = ? AND game_system = ?", level, "midgard").First(&spellLECost).Error
 	if err != nil {
-		// If not found in database, fall back to standard Midgard costs
+		// If not found in database, fall back to standard RPG costs
 		spellLECosts := map[int]int{
 			1:  1,
 			2:  2,
diff --git a/backend/cmd/main.go b/backend/cmd/main.go
index e978447..143565b 100644
--- a/backend/cmd/main.go
+++ b/backend/cmd/main.go
@@ -17,9 +17,9 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-// @title Bamort API
+// @title BaMoRT API
 // @version 1
-// @description This is the API for Bamort
+// @description This is the API for BaMoRT
 // @host localhost:8180
 // @BasePath /
 // @schemes http
@@ -39,7 +39,7 @@ func main() {
 		logger.SetMinLogLevel(logger.INFO)
 	}
 
-	logger.Info("Bamort Server wird gestartet...")
+	logger.Info("BaMoRT Server wird gestartet...")
 	logger.Debug("Debug-Modus ist aktiviert")
 	logger.Info("Environment: %s", cfg.Environment)
 	logger.Info("testingDB Set: %s", cfg.DevTesting)
diff --git a/backend/importer/exporter.go b/backend/importer/exporter.go
index f4e4b38..2181816 100644
--- a/backend/importer/exporter.go
+++ b/backend/importer/exporter.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 )
 
-// ExportCharToVTT converts a Bamort character to VTT JSON format
+// ExportCharToVTT converts a BaMoRT character to VTT JSON format
 func ExportCharToVTT(char *models.Char) (*CharacterImport, error) {
 	vtt := &CharacterImport{}
 
diff --git a/backend/startserver.sh b/backend/startserver.sh
index 0d0653e..9521975 100755
--- a/backend/startserver.sh
+++ b/backend/startserver.sh
@@ -1,4 +1,4 @@
-# Environment variables for Bamort development environment
+# Environment variables for BaMoRT development environment
 
 # API Configuration
 # API_URL=http://localhost:8180
diff --git a/backend/transfer_sqlite_to_mariadb.sh b/backend/transfer_sqlite_to_mariadb.sh
index d16196b..743e942 100755
--- a/backend/transfer_sqlite_to_mariadb.sh
+++ b/backend/transfer_sqlite_to_mariadb.sh
@@ -6,7 +6,7 @@
 BACKEND_URL="http://localhost:8180"
 ENDPOINT="/api/maintenance/transfer-sqlite-to-mariadb"
 
-echo "=== Bamort Data Transfer: SQLite to MariaDB ==="
+echo "=== BaMoRT Data Transfer: SQLite to MariaDB ==="
 echo ""
 
 # Check if clear parameter is provided
diff --git a/frontend/LICENSE b/frontend/LICENSE
index 0e8b963..913b251 100644
--- a/frontend/LICENSE
+++ b/frontend/LICENSE
@@ -1,3 +1,3 @@
-This package is part of the Bamort monorepo and is licensed under the PolyForm Noncommercial License 1.0.0.
+This package is part of the BaMoRT monorepo and is licensed under the PolyForm Noncommercial License 1.0.0.
 
 See ../LICENSE
diff --git a/frontend/README.md b/frontend/README.md
index a6f60ed..842e8f1 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,6 +1,6 @@
 # Bamort Frontend
 
-Vue 3 + Vite frontend for the Bamort monorepo.
+Vue 3 + Vite frontend for the BaMoRT monorepo.
 
 ## Development
 
diff --git a/frontend/index.html b/frontend/index.html
index df51194..c8b4ac9 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -5,7 +5,7 @@
     <!-- <link rel="icon" href="/favicon.ico">-->
     <link rel="icon" href="/favicon.png">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Bamort</title>
+    <title>BaMoRT</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/frontend/src/components/ExportDialog.vue b/frontend/src/components/ExportDialog.vue
index be62be9..90bed0f 100644
--- a/frontend/src/components/ExportDialog.vue
+++ b/frontend/src/components/ExportDialog.vue
@@ -16,7 +16,7 @@
             <option value="">{{ $t('export.pleaseSelectFormat') }}</option>
             <option value="pdf">{{ $t('export.formatPDF') }}</option>
             <option value="vtt">{{ $t('export.formatVTT') }}</option>
-            <option value="bamort">{{ $t('export.formatBamort') }}</option>
+            <option value="bamort">{{ $t('export.formatBaMoRT') }}</option>
           </select>
         </div>
         <div v-if="selectedFormat === 'pdf'" class="form-group">
@@ -111,7 +111,7 @@ export default {
       } else if (this.selectedFormat === 'vtt') {
         await this.exportToVTT()
       } else if (this.selectedFormat === 'bamort') {
-        await this.exportToBamort()
+        await this.exportToBaMoRT()
       }
     },
     
@@ -187,11 +187,11 @@ export default {
       }
     },
 
-    async exportToBamort() {
+    async exportToBaMoRT() {
       this.isExporting = true
       
       try {
-        // Get Bamort JSON data and trigger download
+        // Get BaMoRT JSON data and trigger download
         const response = await API.get(`/api/transfer/download/${this.characterId}`, {
           responseType: 'blob'
         })
@@ -210,7 +210,7 @@ export default {
         this.$emit('export-success')
         this.closeDialog()
       } catch (error) {
-        console.error('Failed to export Bamort format:', error)
+        console.error('Failed to export BaMoRT format:', error)
         alert(this.$t('export.exportFailed') + ': ' + (error.response?.data?.error || error.message))
       } finally {
         this.isExporting = false
diff --git a/frontend/src/locales/de b/frontend/src/locales/de
index 6bd46c8..2c60ea6 100644
--- a/frontend/src/locales/de
+++ b/frontend/src/locales/de
@@ -88,7 +88,7 @@ export default {
   },
   landing:{
     title:'BaMoRT - Charakterverwaltung für mein Lieblingsrollenspielsystem',
-    description:'Bamort ist ein Werkzeug zur Charakterverwaltung für Rollenspiele. Es bietet Funktionen zur Charaktererstellung, -entwicklung und -verwaltung mit Unterstützung für Fertigkeiten, Zauber, Ausrüstung und mehr. Viele Ausrüstungsteile, Fertikeiten und Zauber fehlen noch, da das Projekt noch in der Entwicklung ist.',
+    description:'BaMoRT ist ein Werkzeug zur Charakterverwaltung für Rollenspiele. Es bietet Funktionen zur Charaktererstellung, -entwicklung und -verwaltung mit Unterstützung für Fertigkeiten, Zauber, Ausrüstung und mehr. Viele Ausrüstungsteile, Fertikeiten und Zauber fehlen noch, da das Projekt noch in der Entwicklung ist.',
     frontendVersion:'Frontend Version',
     backendVersion:'Backend Version',
     version:'Version',
@@ -656,7 +656,7 @@ export default {
     },
     faq4: {
       question: 'Wie funktioniert die Charaktererstellung?',
-      answer: 'Die Charaktererstellung basiert auf dem Midgard-Regelsystem. Wählen Sie Volk, Geschlecht und Klasse und verteilen Sie dann Ihre Attributswerte. Das System berechnet automatisch alle abgeleiteten Werte.'
+      answer: 'Die Charaktererstellung basiert auf einem populären deutschen Rollenspiel-Regelsystem. Wählen Sie Volk, Geschlecht und Klasse und verteilen Sie dann Ihre Attributswerte. Das System berechnet automatisch alle abgeleiteten Werte.'
     },
     faq5: {
       question: 'Werden meine Daten gespeichert?',
diff --git a/frontend/src/locales/en b/frontend/src/locales/en
index 1bcdfbe..4916af9 100644
--- a/frontend/src/locales/en
+++ b/frontend/src/locales/en
@@ -87,7 +87,7 @@ export default {
   },
   landing:{
     title:'BaMoRT - Character Management for Role-Playing Games',
-    description:'Bamort is a modern character management tool for role-playing games. It provides comprehensive features for character creation, development, and management with support for skills, spells, equipment, and more.',
+    description:'BaMoRT is a modern character management tool for role-playing games. It provides comprehensive features for character creation, development, and management with support for skills, spells, equipment, and more.',
     frontendVersion:'Frontend Version',
     backendVersion:'Backend Version',
     version:'Version',
@@ -651,7 +651,7 @@ export default {
     },
     faq4: {
       question: 'How does character creation work?',
-      answer: 'Character creation is based on the Midgard rule system. Choose race, gender, and class, then distribute your attribute values. The system automatically calculates all derived values.'
+      answer: 'Character creation is based on a popular German RPG rule system. Choose race, gender, and class, then distribute your attribute values. The system automatically calculates all derived values.'
     },
     faq5: {
       question: 'Is my data saved?',
diff --git a/frontend/src/views/LandingView.vue b/frontend/src/views/LandingView.vue
index 36627d1..0d121ec 100644
--- a/frontend/src/views/LandingView.vue
+++ b/frontend/src/views/LandingView.vue
@@ -2,7 +2,7 @@
   <div class="landing-page">
     <div class="landing-content">
       <div class="dragon-container">
-        <img src="/bamorty.png" alt="Bamort Dragon" class="dragon-image" />
+        <img src="/bamorty.png" alt="BaMoRT Dragon" class="dragon-image" />
       </div>
       
       <div class="info-container">
diff --git a/frontend/startserver.sh b/frontend/startserver.sh
index 6103152..5e7f440 100755
--- a/frontend/startserver.sh
+++ b/frontend/startserver.sh
@@ -1,4 +1,4 @@
-# Environment variables for Bamort development environment
+# Environment variables for BaMoRT development environment
 
 # API Configuration
 # API_URL=http://localhost:8180