diff --git a/examples/bank_reserves/bank_reserves/model.py b/examples/bank_reserves/bank_reserves/model.py
index f54a0fec7f1..17891694d5a 100644
--- a/examples/bank_reserves/bank_reserves/model.py
+++ b/examples/bank_reserves/bank_reserves/model.py
@@ -77,7 +77,7 @@ def get_total_loans(model):
     return np.sum(agent_loans)
 
 
-class BankReservesModel(Model):
+class BankReserves(Model):
 
     # grid height
     grid_h = 20
diff --git a/examples/bank_reserves/bank_reserves/server.py b/examples/bank_reserves/bank_reserves/server.py
index 818c3b6fe97..3cd713632a3 100644
--- a/examples/bank_reserves/bank_reserves/server.py
+++ b/examples/bank_reserves/bank_reserves/server.py
@@ -2,7 +2,7 @@
 from mesa.visualization.modules import CanvasGrid, ChartModule
 from mesa.visualization.UserParam import UserSettableParameter
 from bank_reserves.agents import Person
-from bank_reserves.model import BankReservesModel
+from bank_reserves.model import BankReserves
 
 """
 Citation:
@@ -66,7 +66,7 @@ def person_portrayal(agent):
                              {"Label": "Middle Class", "Color": MID_COLOR}])
 
 # create instance of Mesa ModularServer
-server = ModularServer(BankReservesModel, [canvas_element, chart_element],
+server = ModularServer(BankReserves, [canvas_element, chart_element],
                        "Bank Reserves Model",
                        model_params=model_params
                        )
diff --git a/examples/boid-flockers/boidflockers/SimpleContinuousModule.py b/examples/boid-flockers/boid_flockers/SimpleContinuousModule.py
similarity index 100%
rename from examples/boid-flockers/boidflockers/SimpleContinuousModule.py
rename to examples/boid-flockers/boid_flockers/SimpleContinuousModule.py
diff --git a/examples/boid-flockers/boidflockers/boid.py b/examples/boid-flockers/boid_flockers/boid.py
similarity index 100%
rename from examples/boid-flockers/boidflockers/boid.py
rename to examples/boid-flockers/boid_flockers/boid.py
diff --git a/examples/boid-flockers/boidflockers/model.py b/examples/boid-flockers/boid_flockers/model.py
similarity index 98%
rename from examples/boid-flockers/boidflockers/model.py
rename to examples/boid-flockers/boid_flockers/model.py
index 1297d9efe83..590781b0183 100644
--- a/examples/boid-flockers/boidflockers/model.py
+++ b/examples/boid-flockers/boid_flockers/model.py
@@ -16,7 +16,7 @@
 from .boid import Boid
 
 
-class BoidModel(Model):
+class BoidFlockers(Model):
     '''
     Flocker model class. Handles agent creation, placement and scheduling.
     '''
diff --git a/examples/boid-flockers/boidflockers/server.py b/examples/boid-flockers/boid_flockers/server.py
similarity index 79%
rename from examples/boid-flockers/boidflockers/server.py
rename to examples/boid-flockers/boid_flockers/server.py
index 6af4d29883c..7ecc4915e4f 100644
--- a/examples/boid-flockers/boidflockers/server.py
+++ b/examples/boid-flockers/boid_flockers/server.py
@@ -1,6 +1,6 @@
 from mesa.visualization.ModularVisualization import ModularServer
 
-from .model import BoidModel
+from .model import BoidServer
 from .SimpleContinuousModule import SimpleCanvas
 
 
@@ -18,4 +18,4 @@ def boid_draw(agent):
     "separation": 2
 }
 
-server = ModularServer(BoidModel, [boid_canvas], "Boids", model_params)
+server = ModularServer(BoidServer, [boid_canvas], "Boids", model_params)
diff --git a/examples/boid-flockers/boidflockers/simple_continuous_canvas.js b/examples/boid-flockers/boid_flockers/simple_continuous_canvas.js
similarity index 100%
rename from examples/boid-flockers/boidflockers/simple_continuous_canvas.js
rename to examples/boid-flockers/boid_flockers/simple_continuous_canvas.js
diff --git a/examples/boid-flockers/run.py b/examples/boid-flockers/run.py
index 18257d384a2..be0c1c75c58 100644
--- a/examples/boid-flockers/run.py
+++ b/examples/boid-flockers/run.py
@@ -1,3 +1,3 @@
-from boidflockers.server import server
+from boid_flockers.server import server
 
 server.launch()
diff --git a/tests/test_examples.py b/tests/test_examples.py
index 499a6ff4d07..e500c8679ff 100644
--- a/tests/test_examples.py
+++ b/tests/test_examples.py
@@ -58,18 +58,6 @@ def test_examples(self):
                 model = Model()
                 (model.step() for _ in range(100))
 
-    def test_bank_reserves(self):
-        with self.active_example_dir('bank_reserves'):
-            from bank_reserves.model import BankReservesModel
-            model = BankReservesModel()
-            (model.step() for _ in range(100))
-
-    def test_boid_flockers(self):
-        with self.active_example_dir('boid-flockers'):
-            from boidflockers.model import BoidModel
-            model = BoidModel()
-            (model.step() for _ in range(100))
-
     def test_boltzmann_wealth_model(self):
         with self.active_example_dir('boltzmann_wealth_model'):
             from wealth_model.model import MoneyModel