diff --git a/html-src/rules/moonlight.html b/html-src/rules/freeparking.html
similarity index 94%
rename from html-src/rules/moonlight.html
rename to html-src/rules/freeparking.html
index 7fbdd648..042e889e 100644
--- a/html-src/rules/moonlight.html
+++ b/html-src/rules/freeparking.html
@@ -1,4 +1,4 @@
-<h1>Moonlight</h1>
+<h1>Free Parking</h1>
 <p>
 Montana type. 1 deck. 2 redeals.
 
diff --git a/html-src/rules/fastness.html b/html-src/rules/privatelane.html
similarity index 88%
rename from html-src/rules/fastness.html
rename to html-src/rules/privatelane.html
index 9691955c..c9bc4484 100644
--- a/html-src/rules/fastness.html
+++ b/html-src/rules/privatelane.html
@@ -1,12 +1,12 @@
-<h1>Fastness</h1>
-<p>
-Beleaguered Castle type. 1 deck. No redeal.
-
-<h3>Object</h3>
-<p>
-Move all cards to the foundations.
-
-<h3>Quick Description</h3>
-<p>
-Like <a href="streetsandalleys.html">Streets and Alleys</a>,
-but with two free cells.
+<h1>Private Lane</h1>
+<p>
+Beleaguered Castle type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="streetsandalleys.html">Streets and Alleys</a>,
+but with two free cells.
diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py
index 2c37e04b..9a7f35d8 100644
--- a/pysollib/games/beleagueredcastle.py
+++ b/pysollib/games/beleagueredcastle.py
@@ -434,7 +434,7 @@ class Lasker(Chessboard):
 # ************************************************************************
 # * Siegecraft
 # * Stronghold
-# * Fastness
+# * Private Lane
 # ************************************************************************
 
 class Siegecraft(BeleagueredCastle):
@@ -453,7 +453,7 @@ class Stronghold(StreetsAndAlleys):
         StreetsAndAlleys.createGame(self, reserves=1)
 
 
-class Fastness(StreetsAndAlleys):
+class PrivateLane(StreetsAndAlleys):
     Hint_Class = FreeCellType_Hint
     Solver_Class = FreeCellSolverWrapper(sbb='rank')
 
@@ -895,9 +895,9 @@ registerGame(GameInfo(148, Chessboard, "Chessboard",
 registerGame(GameInfo(300, Stronghold, "Stronghold",
                       GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0,
                       GI.SL_MOSTLY_SKILL))
-registerGame(GameInfo(301, Fastness, "Fastness",
+registerGame(GameInfo(301, PrivateLane, "Private Lane",
                       GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0,
-                      GI.SL_MOSTLY_SKILL, altnames=('Private Lane',)))
+                      GI.SL_MOSTLY_SKILL, altnames=('Fastness',)))
 registerGame(GameInfo(306, Zerline, "Zerline",
                       GI.GT_BELEAGUERED_CASTLE, 2, 0, GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(324, Bastion, "Bastion",
diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py
index 35835c03..ca67c6a7 100644
--- a/pysollib/games/montana.py
+++ b/pysollib/games/montana.py
@@ -371,10 +371,10 @@ class Galary(RedMoon):
 
 
 # ************************************************************************
-# * Moonlight
+# * Free Parking
 # ************************************************************************
 
-class Moonlight(Montana):
+class FreeParking(Montana):
     RowStack_Class = Galary_RowStack
     Hint_Class = Galary_Hint
 
@@ -682,9 +682,10 @@ registerGame(GameInfo(117, RedMoon, "Red Moon",
 registerGame(GameInfo(275, Galary, "Galary",
                       GI.GT_MONTANA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 2,
                       GI.SL_MOSTLY_SKILL))
-registerGame(GameInfo(276, Moonlight, "Moonlight",
+registerGame(GameInfo(276, FreeParking, "Free Parking",
                       GI.GT_MONTANA | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL,
-                      si={"ncards": 48}, altnames="Free Parking"))
+                      si={"ncards": 48}, altnames=("Moonlight",
+                                                   "Park and Ride")))
 registerGame(GameInfo(380, Jungle, "Jungle",
                       GI.GT_MONTANA | GI.GT_OPEN, 1, 1, GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(381, SpacesAndAces, "Spaces and Aces",