diff --git a/lib/engine/game/g_1807/entities.rb b/lib/engine/game/g_1807/entities.rb
index a70f23b5fa..9653d106d0 100644
--- a/lib/engine/game/g_1807/entities.rb
+++ b/lib/engine/game/g_1807/entities.rb
@@ -746,7 +746,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -757,7 +757,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -768,7 +768,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -779,7 +779,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -790,7 +790,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -801,7 +801,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -812,7 +812,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -823,7 +823,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -834,7 +834,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -845,7 +845,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -856,7 +856,7 @@ module Entities
             float_percent: 20,
             always_market_price: true,
             tokens: [0, 20, 20, 20],
-            type: 'major',
+            type: 'public',
             shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
             color: '#3c7b5c',
           },
@@ -934,10 +934,10 @@ def company_header(company)
         def unstarted_corporation_summary
           unipoed = (@corporations + @future_corporations).reject(&:ipoed)
           minor = unipoed.select { |c| c.type == :minor }
-          major = unipoed.select { |c| c.type == :major }
+          major = unipoed.select { |c| c.type == :public }
           system = unipoed.select { |c| c.type == :system }
           summary = "#{minor.size} #{minor.one? ? 'minor' : 'minors'}, " \
-                    "#{major.size} #{major.one? ? 'major' : 'majors'}, " \
+                    "#{major.size} public, " \
                     "#{system.size} #{system.one? ? 'system' : 'systems'}"
           [summary, unipoed]
         end
@@ -946,7 +946,7 @@ def maximum_loans(entity)
           case entity.type
           when :minor
             2
-          when :major
+          when :public
             5
           when :system
             10
diff --git a/lib/engine/game/g_1807/trains.rb b/lib/engine/game/g_1807/trains.rb
index 580f8e5d24..5e9256d696 100644
--- a/lib/engine/game/g_1807/trains.rb
+++ b/lib/engine/game/g_1807/trains.rb
@@ -24,7 +24,7 @@ module Trains
           'minors_convert' => ['Minors convert',
                                'Minor companies may merge, convert or be taken over.'],
           'systems_form' => ['Systems form',
-                             'Systems may form by merging major companies.'],
+                             'Systems may form by merging public companies.'],
           'double_jump' => ['Double jumps',
                             'Systems may double-jump.'],
           'train_export' => ['Train exported',
@@ -41,7 +41,7 @@ module Trains
           },
           {
             name: '3',
-            train_limit: { minor: 2, major: 4 },
+            train_limit: { minor: 2, public: 4 },
             tiles: %i[yellow green],
             status: %w[minors_start can_buy_companies minors_convert],
             on: '3',
@@ -49,7 +49,7 @@ module Trains
           },
           {
             name: '4',
-            train_limit: { minor: 1, major: 3 },
+            train_limit: { minor: 1, public: 3 },
             tiles: %i[yellow green],
             status: %w[minors_start can_buy_companies minors_convert train_export],
             on: '4',
@@ -57,7 +57,7 @@ module Trains
           },
           {
             name: '5',
-            train_limit: { minor: 1, major: 3 },
+            train_limit: { minor: 1, public: 3 },
             tiles: %i[yellow green brown],
             status: %w[can_buy_companies minors_convert train_export],
             on: %w[5 3G],
@@ -65,7 +65,7 @@ module Trains
           },
           {
             name: '6',
-            train_limit: { minor: 1, major: 2, system: 4 },
+            train_limit: { minor: 1, public: 2, system: 4 },
             tiles: %i[yellow green brown],
             status: %w[can_buy_companies minors_convert systems_form train_export],
             on: %w[6 4G],
@@ -73,7 +73,7 @@ module Trains
           },
           {
             name: '7',
-            train_limit: { minor: 1, major: 2, system: 4 },
+            train_limit: { minor: 1, public: 2, system: 4 },
             tiles: %i[yellow green brown gray],
             status: %w[can_buy_companies minors_convert systems_form train_export],
             on: %w[3+3 5G],
@@ -81,7 +81,7 @@ module Trains
           },
           {
             name: '8',
-            train_limit: { minor: 0, major: 2, system: 4 },
+            train_limit: { minor: 0, public: 2, system: 4 },
             tiles: %i[yellow green brown gray],
             status: %w[can_buy_companies minors_convert systems_form double_jump],
             on: %w[4+4 6G],
@@ -269,8 +269,8 @@ def timeline
             'Twelve minor companies are available from the first stock round.',
             'Another six minor companies become available for purchase in stock round 2.',
             'The last six minor companes are available once the first 3-train is bought.',
-            'Minors can be merged or converted into major companies from phase 3.',
-            'Majors can be merged to form systems from phase 6.',
+            'Minor companies can be merged or converted into public companies from phase 3.',
+            'Public companies can be merged to form systems from phase 6.',
             '2+2 and 5+5E trains are available after a 4+4 or 6G train has been purchased.',
           ]
         end