diff -up src/sage/features/rubiks.py.orig src/sage/features/rubiks.py --- src/sage/features/rubiks.py.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/features/rubiks.py 2020-10-30 16:35:54.828279888 -0600 @@ -30,7 +30,7 @@ class cu2(Executable): sage: isinstance(cu2(), cu2) True """ - Executable.__init__(self, "cu2", executable="cu2", + Executable.__init__(self, "cu2", executable="rubiks_cu2", spkg="rubiks") @@ -53,7 +53,7 @@ class size222(Executable): sage: isinstance(size222(), size222) True """ - Executable.__init__(self, "size222", executable="size222", + Executable.__init__(self, "size222", executable="rubiks_size222", spkg="rubiks") @@ -76,7 +76,7 @@ class optimal(Executable): sage: isinstance(optimal(), optimal) True """ - Executable.__init__(self, "optimal", executable="optimal", + Executable.__init__(self, "optimal", executable="rubiks_optimal", spkg="rubiks") @@ -99,7 +99,7 @@ class mcube(Executable): sage: isinstance(mcube(), mcube) True """ - Executable.__init__(self, "mcube", executable="mcube", + Executable.__init__(self, "mcube", executable="rubiks_mcube", spkg="rubiks") @@ -122,7 +122,7 @@ class dikcube(Executable): sage: isinstance(dikcube(), dikcube) True """ - Executable.__init__(self, "dikcube", executable="dikcube", + Executable.__init__(self, "dikcube", executable="rubiks_dikcube", spkg="rubiks") @@ -145,7 +145,7 @@ class cubex(Executable): sage: isinstance(cubex(), cubex) True """ - Executable.__init__(self, "cubex", executable="cubex", + Executable.__init__(self, "cubex", executable="rubiks_cubex", spkg="rubiks") diff -up src/sage/interfaces/rubik.py.orig src/sage/interfaces/rubik.py --- src/sage/interfaces/rubik.py.orig 2020-10-24 11:37:59.000000000 -0600 +++ src/sage/interfaces/rubik.py 2020-10-30 16:37:38.173193027 -0600 @@ -96,7 +96,7 @@ class OptimalSolver: """ Interface to Michael Reid's optimal Rubik's Cube solver. """ - __cmd = "optimal" + __cmd = "rubiks_optimal" def __init__(self, verbose=False, wait=True): self.verbose = verbose @@ -185,7 +185,7 @@ move_map = { class CubexSolver: - __cmd = "cubex" + __cmd = "rubiks_cubex" def __call__(self, facets): return self.solve(facets) @@ -238,7 +238,7 @@ class CubexSolver: class DikSolver: - __cmd = "dikcube" + __cmd = "rubiks_dikcube" def __call__(self, facets): return self.solve(facets)