diff --git a/code/app/Athenia/Jobs/Statistics/ProcessTargetStatisticsJob.php b/code/app/Athenia/Jobs/Statistic/ProcessTargetStatisticsJob.php
similarity index 96%
rename from code/app/Athenia/Jobs/Statistics/ProcessTargetStatisticsJob.php
rename to code/app/Athenia/Jobs/Statistic/ProcessTargetStatisticsJob.php
index 1b814dc7..c1dab974 100644
--- a/code/app/Athenia/Jobs/Statistics/ProcessTargetStatisticsJob.php
+++ b/code/app/Athenia/Jobs/Statistic/ProcessTargetStatisticsJob.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Athenia\Jobs\Statistics;
+namespace App\Athenia\Jobs\Statistic;
 
 use App\Athenia\Contracts\Models\CanBeStatisticTargetContract;
 use App\Athenia\Contracts\Services\Statistic\TargetStatisticProcessingServiceContract;
diff --git a/code/app/Athenia/Jobs/Statistics/RecountStatisticJob.php b/code/app/Athenia/Jobs/Statistic/RecountStatisticJob.php
similarity index 96%
rename from code/app/Athenia/Jobs/Statistics/RecountStatisticJob.php
rename to code/app/Athenia/Jobs/Statistic/RecountStatisticJob.php
index 681f5f46..c369ca7d 100644
--- a/code/app/Athenia/Jobs/Statistics/RecountStatisticJob.php
+++ b/code/app/Athenia/Jobs/Statistic/RecountStatisticJob.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Athenia\Jobs\Statistics;
+namespace App\Athenia\Jobs\Statistic;
 
 use App\Athenia\Contracts\Services\Statistic\TargetStatisticProcessingServiceContract;
 use App\Models\Statistic\Statistic;
diff --git a/code/database/factories/Statistics/StatisticFactory.php b/code/database/factories/Statistic/StatisticFactory.php
similarity index 94%
rename from code/database/factories/Statistics/StatisticFactory.php
rename to code/database/factories/Statistic/StatisticFactory.php
index 5455aebb..dbbf8b4c 100644
--- a/code/database/factories/Statistics/StatisticFactory.php
+++ b/code/database/factories/Statistic/StatisticFactory.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Database\Factories\Statistics;
+namespace Database\Factories\Statistic;
 
 use App\Models\Statistic\Statistic;
 use Illuminate\Database\Eloquent\Factories\Factory;
diff --git a/code/database/factories/Statistics/StatisticFilterFactory.php b/code/database/factories/Statistic/StatisticFilterFactory.php
similarity index 95%
rename from code/database/factories/Statistics/StatisticFilterFactory.php
rename to code/database/factories/Statistic/StatisticFilterFactory.php
index e79bd795..113d58eb 100644
--- a/code/database/factories/Statistics/StatisticFilterFactory.php
+++ b/code/database/factories/Statistic/StatisticFilterFactory.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Database\Factories\Statistics;
+namespace Database\Factories\Statistic;
 
 use App\Models\Statistic\Statistic;
 use App\Models\Statistic\StatisticFilter;
diff --git a/code/database/factories/Statistics/TargetStatisticFactory.php b/code/database/factories/Statistic/TargetStatisticFactory.php
similarity index 97%
rename from code/database/factories/Statistics/TargetStatisticFactory.php
rename to code/database/factories/Statistic/TargetStatisticFactory.php
index dba08a75..4bba2607 100644
--- a/code/database/factories/Statistics/TargetStatisticFactory.php
+++ b/code/database/factories/Statistic/TargetStatisticFactory.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Database\Factories\Statistics;
+namespace Database\Factories\Statistic;
 
 use App\Models\Statistic\TargetStatistic;
 use App\Models\Statistic\Statistic;
diff --git a/code/tests/Athenia/Unit/Jobs/Statistics/ProcessTargetStatisticsJobTest.php b/code/tests/Athenia/Unit/Jobs/Statistic/ProcessTargetStatisticsJobTest.php
similarity index 98%
rename from code/tests/Athenia/Unit/Jobs/Statistics/ProcessTargetStatisticsJobTest.php
rename to code/tests/Athenia/Unit/Jobs/Statistic/ProcessTargetStatisticsJobTest.php
index 98fd7ff6..58ccd64e 100644
--- a/code/tests/Athenia/Unit/Jobs/Statistics/ProcessTargetStatisticsJobTest.php
+++ b/code/tests/Athenia/Unit/Jobs/Statistic/ProcessTargetStatisticsJobTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Tests\Athenia\Unit\Jobs\Statistics;
+namespace Tests\Athenia\Unit\Jobs\Statistic;
 
 use App\Athenia\Contracts\Services\Statistic\TargetStatisticProcessingServiceContract;
 use App\Athenia\Jobs\Statistic\ProcessTargetStatisticsJob;
diff --git a/code/tests/Athenia/Unit/Jobs/Statistics/RecountStatisticJobTest.php b/code/tests/Athenia/Unit/Jobs/Statistic/RecountStatisticJobTest.php
similarity index 98%
rename from code/tests/Athenia/Unit/Jobs/Statistics/RecountStatisticJobTest.php
rename to code/tests/Athenia/Unit/Jobs/Statistic/RecountStatisticJobTest.php
index 0268c88d..2f25ffdb 100644
--- a/code/tests/Athenia/Unit/Jobs/Statistics/RecountStatisticJobTest.php
+++ b/code/tests/Athenia/Unit/Jobs/Statistic/RecountStatisticJobTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Tests\Athenia\Unit\Jobs\Statistics;
+namespace Tests\Athenia\Unit\Jobs\Statistic;
 
 use App\Athenia\Contracts\Services\Statistic\TargetStatisticProcessingServiceContract;
 use App\Athenia\Jobs\Statistic\RecountStatisticJob;
diff --git a/update.sh b/update.sh
index 52e92c3a..68aaf84c 100755
--- a/update.sh
+++ b/update.sh
@@ -22,6 +22,7 @@ CHANGED=$(git diff --name-status "$LAST_TAG" HEAD)
 # 2. Prepare lists
 ADDED_MODIFIED=()
 DELETED=()
+RENAMED=()
 
 while IFS= read -r line; do
     STATUS=$(echo "$line" | awk '{print $1}')
@@ -33,10 +34,39 @@ while IFS= read -r line; do
         ADDED_MODIFIED+=("$FILE")
     elif [[ "$STATUS" == "D" ]]; then
         DELETED+=("$FILE")
+    elif [[ "$STATUS" == "R" ]]; then
+        OLD_FILE=$(echo "$line" | awk '{print $2}')
+        NEW_FILE=$(echo "$line" | awk '{print $3}')
+        RENAMED+=("$OLD_FILE|$NEW_FILE")
     fi
 done <<< "$CHANGED"
 
-# 3. Copy new/modified files
+# 3. Handle renamed files first
+for RENAME in "${RENAMED[@]}"; do
+    OLD_FILE=$(echo "$RENAME" | cut -d'|' -f1)
+    NEW_FILE=$(echo "$RENAME" | cut -d'|' -f2)
+    
+    if [[ "$OLD_FILE" == app/Providers/* || "$OLD_FILE" == UPGRADE*.md || "$OLD_FILE" == "update.sh" ]]; then
+        continue
+    fi
+    
+    OLD_PATH="$CHILD_PATH/$OLD_FILE"
+    NEW_PATH="$CHILD_PATH/$NEW_FILE"
+    
+    # If the old file exists in child repo, move it to the new location
+    if [ -f "$OLD_PATH" ]; then
+        mkdir -p "$(dirname "$NEW_PATH")"
+        mv "$OLD_PATH" "$NEW_PATH"
+        echo "Renamed $OLD_FILE to $NEW_FILE in child repository"
+    else
+        # If old file doesn't exist, just copy the new file
+        mkdir -p "$(dirname "$NEW_PATH")"
+        cp "$NEW_FILE" "$NEW_PATH"
+        echo "Copied $NEW_FILE to child repository (rename from $OLD_FILE)"
+    fi
+done
+
+# 4. Copy new/modified files
 SAFE_FILES=()
 for FILE in "${ADDED_MODIFIED[@]}"; do
     if [[ "$FILE" == app/Providers/* || "$FILE" == UPGRADE*.md || "$FILE" == "update.sh" ]]; then
@@ -52,7 +82,7 @@ for FILE in "${ADDED_MODIFIED[@]}"; do
     echo "Copied $FILE to $DEST"
 done
 
-# 4. Delete removed files
+# 5. Delete removed files
 for FILE in "${DELETED[@]}"; do
     if [[ "$FILE" == app/Providers/* || "$FILE" == UPGRADE*.md || "$FILE" == "update.sh" ]]; then
         continue
@@ -64,13 +94,14 @@ for FILE in "${DELETED[@]}"; do
     fi
 done
 
-# 5. Compare diffs and report
+# 6. Compare diffs and report
 # Get the latest tag for the 'to' version
 TO_TAG=$(git describe --tags --abbrev=0)
 REPORT_NAME="update_report_${LAST_TAG}_to_${TO_TAG}.txt"
 REPORT="$CHILD_PATH/$REPORT_NAME"
 > "$REPORT"
 
+# Compare added/modified files
 for FILE in "${ADDED_MODIFIED[@]}"; do
     if [[ "$FILE" == app/Providers/* || "$FILE" == UPGRADE*.md || "$FILE" == "update.sh" ]]; then
         continue
@@ -88,6 +119,28 @@ for FILE in "${ADDED_MODIFIED[@]}"; do
     rm -f /tmp/main_diff /tmp/child_diff
 done
 
+# Compare renamed files
+for RENAME in "${RENAMED[@]}"; do
+    OLD_FILE=$(echo "$RENAME" | cut -d'|' -f1)
+    NEW_FILE=$(echo "$RENAME" | cut -d'|' -f2)
+    
+    if [[ "$OLD_FILE" == app/Providers/* || "$OLD_FILE" == UPGRADE*.md || "$OLD_FILE" == "update.sh" ]]; then
+        continue
+    fi
+    
+    # Generate unified diff in main repo for the rename
+    git diff "$LAST_TAG" -- "$NEW_FILE" | grep -v '^index' | sed 's/[[:space:]]*$//' > /tmp/main_diff
+    # Generate unified diff in child repo for the new file
+    pushd "$CHILD_PATH" > /dev/null
+    git diff -- "$NEW_FILE" | grep -v '^index' | sed 's/[[:space:]]*$//' > /tmp/child_diff
+    popd > /dev/null
+    # Compare the diffs byte-for-byte
+    if ! diff -q /tmp/main_diff /tmp/child_diff > /dev/null; then
+        echo "$NEW_FILE (renamed from $OLD_FILE)" >> "$REPORT"
+    fi
+    rm -f /tmp/main_diff /tmp/child_diff
+done
+
 # Compare deleted files
 for FILE in "${DELETED[@]}"; do
     if [[ "$FILE" == app/Providers/* || "$FILE" == UPGRADE*.md || "$FILE" == "update.sh" ]]; then