diff --git a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php
index 292478260..2b584b438 100644
--- a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php
+++ b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php
@@ -103,7 +103,8 @@ class MiningTaxesController extends Controller
           
             if($moon->moon_type != 'R32' || $moon->moon_type != 'R64') {
                 $moons->push([
-                    'system' => $moon->name,
+                    'system' => $moon->system_name,
+                    'moon_name' => $moon->name,
                     'ores' => $ores,
                 ]);
             }
@@ -192,7 +193,8 @@ class MiningTaxesController extends Controller
             ])->get(['ore_name', 'quantity'])->toArray();
 
             $moons->push([
-                'system' => $moon->name,
+                'system' => $moon->system_name,
+                'moon_name' => $moon->name,
                 'ores' => $ores,
             ]);
         }
diff --git a/resources/views/miningtax/user/display/moons/allmoons.blade.php b/resources/views/miningtax/user/display/moons/allmoons.blade.php
index 7b8b1cafd..5a6c5a26f 100644
--- a/resources/views/miningtax/user/display/moons/allmoons.blade.php
+++ b/resources/views/miningtax/user/display/moons/allmoons.blade.php
@@ -34,7 +34,7 @@
                 @foreach($moons as $moon)
                     @if($moon['system'] == $system)
                     <tr>
-                        <td>{{ $system }}</td>
+                        <td>{{ $moon['moon_name'] }}</td>
                     @if(isset($moon['ores'][0]))
                         @if(in_array($moon['ores'][0]['ore_name'], $r4Goo))
                         <td class="table-secondary">{{ $moon['ores'][0]['ore_name'] }}</td>
@@ -57,8 +57,8 @@
                         <td class="table-danger">{{ number_format(($moon['ores'][0]['quantity'] * 100.00), 2, ".", ",") }}%</td>
                         @endif
                     @else
-                    <td></td>
-                    <td></td>
+                        <td></td>
+                        <td></td>
                     @endif
                     @if(isset($moon['ores'][1]))
                         @if(in_array($moon['ores'][1]['ore_name'], $r4Goo))
@@ -82,8 +82,8 @@
                         <td class="table-danger">{{ number_format(($moon['ores'][1]['quantity'] * 100.00), 2, ".", ",") }}%</td>
                         @endif
                     @else
-                    <td></td>
-                    <td></td>
+                        <td></td>
+                        <td></td>
                     @endif
                     @if(isset($moon['ores'][2]))
                         @if(in_array($moon['ores'][2]['ore_name'], $r4Goo))
@@ -107,8 +107,8 @@
                         <td class="table-danger">{{ number_format(($moon['ores'][2]['quantity'] * 100.00), 2, ".", ",") }}%</td>
                         @endif
                     @else
-                    <td></td>
-                    <td></td>
+                        <td></td>
+                        <td></td>
                     @endif
                     @if(isset($moon['ores'][3]))
                         @if(in_array($moon['ores'][3]['ore_name'], $r4Goo))
@@ -132,8 +132,8 @@
                         <td class="table-danger">{{ number_format(($moon['ores'][3]['quantity'] * 100.00), 2, ".", ",") }}%</td>
                         @endif
                     @else
-                    <td></td>
-                    <td></td>
+                        <td></td>
+                        <td></td>
                     @endif
                     </tr>
                     @endif
diff --git a/resources/views/miningtax/user/display/moons/availablemoons.blade.php b/resources/views/miningtax/user/display/moons/availablemoons.blade.php
index 0ae37fa6e..9be801b70 100644
--- a/resources/views/miningtax/user/display/moons/availablemoons.blade.php
+++ b/resources/views/miningtax/user/display/moons/availablemoons.blade.php
@@ -34,7 +34,7 @@
                 @foreach($moons as $moon)
                     @if($moon['system'] == $system)
                     <tr>
-                        <td>{{ $system }}</td>
+                        <td>{{ $moon['moon_name'] }}</td>
                     @if(isset($moon['ores'][0]))
                         @if(in_array($moon['ores'][0]['ore_name'], $r4Goo))
                         <td class="table-secondary">{{ $moon['ores'][0]['ore_name'] }}</td>