diff --git a/src/main/java/de/prob2/jupyter/CommandUtils.java b/src/main/java/de/prob2/jupyter/CommandUtils.java
index 212d82dae4f9b3447201c8402471cdbb8bc1b91c..7cb21e06bacfbcd9da9007d9e67c3b3a17387135 100644
--- a/src/main/java/de/prob2/jupyter/CommandUtils.java
+++ b/src/main/java/de/prob2/jupyter/CommandUtils.java
@@ -54,32 +54,6 @@ public final class CommandUtils {
 		throw new AssertionError("Utility class");
 	}
 	
-	public static @NotNull String prettyOperationName(final @NotNull String name) {
-		switch (name) {
-			case "$setup_constants":
-				return "SETUP_CONSTANTS";
-			
-			case "$initialise_machine":
-				return "INITIALISATION";
-			
-			default:
-				return name;
-		}
-	}
-	
-	public static @NotNull String unprettyOperationName(final @NotNull String name) {
-		switch (name) {
-			case "SETUP_CONSTANTS":
-				return "$setup_constants";
-			
-			case "INITIALISATION":
-				return "$initialise_machine";
-			
-			default:
-				return name;
-		}
-	}
-	
 	/**
 	 * <p>
 	 * Split an argument string according to the given parameter specification.
diff --git a/src/main/java/de/prob2/jupyter/commands/ExecCommand.java b/src/main/java/de/prob2/jupyter/commands/ExecCommand.java
index f3914382c10328431ba68bbe429ba45877caca7a..2d3d73c177836730645583cbb472921ca84d8307 100644
--- a/src/main/java/de/prob2/jupyter/commands/ExecCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/ExecCommand.java
@@ -71,7 +71,7 @@ public final class ExecCommand implements Command {
 	@Override
 	public @NotNull DisplayData run(final @NotNull ParsedArguments args) {
 		final Trace trace = this.animationSelector.getCurrentTrace();
-		final String translatedOpName = CommandUtils.unprettyOperationName(args.get(OPERATION_PARAM));
+		final String translatedOpName = Transition.unprettifyName(args.get(OPERATION_PARAM));
 		final String predicate;
 		if (!args.get(PREDICATE_PARAM).isPresent()) {
 			predicate = "1=1";
@@ -103,8 +103,7 @@ public final class ExecCommand implements Command {
 				final List<String> opNames = this.animationSelector.getCurrentTrace()
 					.getNextTransitions()
 					.stream()
-					.map(Transition::getName)
-					.map(CommandUtils::prettyOperationName)
+					.map(Transition::getPrettyName)
 					.distinct()
 					.filter(s -> s.startsWith(prefix))
 					.sorted()