diff --git a/examples/python/3_jugs_mip.py b/examples/python/3_jugs_mip.py
index b19a5b462a..bf3c382569 100644
--- a/examples/python/3_jugs_mip.py
+++ b/examples/python/3_jugs_mip.py
@@ -45,7 +45,7 @@ def main(sol='CBC'):
                              pywraplp.Solver.GLPK_MIXED_INTEGER_PROGRAMMING)
   else:
     # Using CBC
-    solver = pywraplp.Solver('CoinsGridCLP',
+    solver = pywraplp.Solver('CoinsGridCBC',
                              pywraplp.Solver.CBC_MIXED_INTEGER_PROGRAMMING)
 
   #
diff --git a/examples/python/assignment6_mip.py b/examples/python/assignment6_mip.py
index a2e5d88789..7b0735e416 100644
--- a/examples/python/assignment6_mip.py
+++ b/examples/python/assignment6_mip.py
@@ -45,7 +45,7 @@ import sys
 from ortools.linear_solver import pywraplp
 
 
-def main(sol='GLPK'):
+def main(sol='CBC'):
 
   # Create the solver.
 
@@ -56,8 +56,8 @@ def main(sol='GLPK'):
     solver = pywraplp.Solver('CoinsGridGLPK',
                              pywraplp.Solver.GLPK_MIXED_INTEGER_PROGRAMMING)
   else:
-    # Using CLP
-    solver = pywraplp.Solver('CoinsGridCLP',
+    # Using CBC
+    solver = pywraplp.Solver('CoinsGridCBC',
                              pywraplp.Solver.CBC_MIXED_INTEGER_PROGRAMMING)
 
   #
diff --git a/examples/python/blending.py b/examples/python/blending.py
index bc1e2ba978..a4d594938b 100644
--- a/examples/python/blending.py
+++ b/examples/python/blending.py
@@ -27,7 +27,7 @@ import sys
 from ortools.linear_solver import pywraplp
 
 
-def main(sol='GLPK'):
+def main(sol='CBC'):
 
   # Create the solver.
 
@@ -38,8 +38,8 @@ def main(sol='GLPK'):
     solver = pywraplp.Solver('CoinsGridGLPK',
                              pywraplp.Solver.GLPK_MIXED_INTEGER_PROGRAMMING)
   else:
-    # Using CLP
-    solver = pywraplp.Solver('CoinsGridCLP',
+    # Using CBC
+    solver = pywraplp.Solver('CoinsGridCBC',
                              pywraplp.Solver.CBC_MIXED_INTEGER_PROGRAMMING)
 
   #
diff --git a/examples/python/coloring_ip.py b/examples/python/coloring_ip.py
index ad22b375d1..a2459e6e27 100644
--- a/examples/python/coloring_ip.py
+++ b/examples/python/coloring_ip.py
@@ -42,7 +42,7 @@ import sys
 from ortools.linear_solver import pywraplp
 
 
-def main(sol='GLPK'):
+def main(sol='CBC'):
 
   # Create the solver.
 
diff --git a/examples/python/diet1_mip.py b/examples/python/diet1_mip.py
index 17f0e23065..5029951868 100644
--- a/examples/python/diet1_mip.py
+++ b/examples/python/diet1_mip.py
@@ -40,7 +40,7 @@ import sys
 from ortools.linear_solver import pywraplp
 
 
-def main(sol='GLPK'):
+def main(sol='CBC'):
 
   # Create the solver.
 
diff --git a/examples/python/game_theory_taha.py b/examples/python/game_theory_taha.py
index 675cfbd927..c3d088d487 100644
--- a/examples/python/game_theory_taha.py
+++ b/examples/python/game_theory_taha.py
@@ -29,7 +29,7 @@ import sys
 from ortools.linear_solver import pywraplp
 
 
-def main(sol='GLPK'):
+def main(sol='CBC'):
 
   # Create the solver.
 
diff --git a/examples/python/knapsack_mip.py b/examples/python/knapsack_mip.py
index 089e5d754b..7da95d631c 100644
--- a/examples/python/knapsack_mip.py
+++ b/examples/python/knapsack_mip.py
@@ -27,7 +27,7 @@ import sys
 from ortools.linear_solver import pywraplp
 
 
-def main(sol='GLPK'):
+def main(sol='CBC'):
 
   # Create the solver.
 
@@ -38,8 +38,8 @@ def main(sol='GLPK'):
     solver = pywraplp.Solver('CoinsGridGLPK',
                              pywraplp.Solver.GLPK_MIXED_INTEGER_PROGRAMMING)
   else:
-    # Using CLP
-    solver = pywraplp.Solver('CoinsGridCLP',
+    # Using CBC
+    solver = pywraplp.Solver('CoinsGridCBC',
                              pywraplp.Solver.CBC_MIXED_INTEGER_PROGRAMMING)
 
   #
diff --git a/examples/python/least_square.py b/examples/python/least_square.py
index 8e867df766..d8ebf83ef6 100644
--- a/examples/python/least_square.py
+++ b/examples/python/least_square.py
@@ -30,7 +30,7 @@ import sys
 from ortools.linear_solver import pywraplp
 
 
-def main(sol='GLPK'):
+def main(sol='CBC'):
 
   # Create the solver.
 
diff --git a/examples/python/magic_square_mip.py b/examples/python/magic_square_mip.py
index f170386f85..779666c73a 100644
--- a/examples/python/magic_square_mip.py
+++ b/examples/python/magic_square_mip.py
@@ -53,7 +53,7 @@ from ortools.linear_solver import pywraplp
 #
 
 
-def main(n=3, sol='GLPK', use_output_matrix=0):
+def main(n=3, sol='CBC', use_output_matrix=0):
 
   # Create the solver.
 
diff --git a/examples/python/production.py b/examples/python/production.py
index 2e3c527e00..3e2e80801c 100644
--- a/examples/python/production.py
+++ b/examples/python/production.py
@@ -27,7 +27,7 @@ import sys
 from ortools.linear_solver import pywraplp
 
 
-def main(sol='GLPK'):
+def main(sol='CBC'):
 
   # Create the solver.
 
diff --git a/examples/python/stigler.py b/examples/python/stigler.py
index 2ca2e3e0b1..67e422fc8f 100644
--- a/examples/python/stigler.py
+++ b/examples/python/stigler.py
@@ -123,7 +123,7 @@ import sys
 from ortools.linear_solver import pywraplp
 
 
-def main(sol="GLPK"):
+def main(sol="CBC"):
 
   # Create the solver.
 
diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk
index c1a3d85141..d4ea24e59d 100644
--- a/makefiles/Makefile.cpp.mk
+++ b/makefiles/Makefile.cpp.mk
@@ -438,8 +438,8 @@ CONSTRAINT_SOLVER_LIB_OBJS = \
 	$(OBJ_DIR)/constraint_solver/alldiff_cst.$O\
 	$(OBJ_DIR)/constraint_solver/assignment.$O\
 	$(OBJ_DIR)/constraint_solver/assignment.pb.$O\
-	$(OBJ_DIR)/constraint_solver/ac4r_table.$O\
 	$(OBJ_DIR)/constraint_solver/ac4_mdd_reset_table.$O\
+	$(OBJ_DIR)/constraint_solver/ac4r_table.$O\
 	$(OBJ_DIR)/constraint_solver/collect_variables.$O\
 	$(OBJ_DIR)/constraint_solver/constraint_solver.$O\
 	$(OBJ_DIR)/constraint_solver/constraints.$O\
@@ -490,12 +490,12 @@ $(OBJ_DIR)/constraint_solver/assignment.$O:$(SRC_DIR)/constraint_solver/assignme
 $(OBJ_DIR)/constraint_solver/assignment.pb.$O:$(GEN_DIR)/constraint_solver/assignment.pb.cc
 	$(CCC) $(CFLAGS) -c $(GEN_DIR)/constraint_solver/assignment.pb.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sassignment.pb.$O
 
-$(OBJ_DIR)/constraint_solver/ac4r_table.$O:$(SRC_DIR)/constraint_solver/ac4r_table.cc $(SRC_DIR)/constraint_solver/constraint_solver.h
-	$(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/ac4r_table.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sac4r_table.$O
-
 $(OBJ_DIR)/constraint_solver/ac4_mdd_reset_table.$O:$(SRC_DIR)/constraint_solver/ac4_mdd_reset_table.cc $(SRC_DIR)/constraint_solver/constraint_solver.h
 	$(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/ac4_mdd_reset_table.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sac4_mdd_reset_table.$O
 
+$(OBJ_DIR)/constraint_solver/ac4r_table.$O:$(SRC_DIR)/constraint_solver/ac4r_table.cc $(SRC_DIR)/constraint_solver/constraint_solver.h
+	$(CCC) $(CFLAGS) -c $(SRC_DIR)/constraint_solver/ac4r_table.cc $(OBJ_OUT)$(OBJ_DIR)$Sconstraint_solver$Sac4r_table.$O
+
 $(GEN_DIR)/constraint_solver/assignment.pb.cc:$(SRC_DIR)/constraint_solver/assignment.proto
 	$(PROTOBUF_DIR)/bin/protoc --proto_path=$(INC_DIR) --cpp_out=$(GEN_DIR) $(SRC_DIR)/constraint_solver/assignment.proto