diff --git a/src/main/java/kieker/diagnosis/mainview/subview/util/OperationCellValueFactory.java b/src/main/java/kieker/diagnosis/mainview/subview/util/OperationCellValueFactory.java
index 0e31fa10d7010d93eb2145ebed43fe24d6d82aa0..9237f65a34f6da0dc5982465bac3e568c6ba6db1 100644
--- a/src/main/java/kieker/diagnosis/mainview/subview/util/OperationCellValueFactory.java
+++ b/src/main/java/kieker/diagnosis/mainview/subview/util/OperationCellValueFactory.java
@@ -29,13 +29,13 @@ public class OperationCellValueFactory implements Callback<CellDataFeatures<?, S
 	public ObservableValue<String> call(final CellDataFeatures<?, String> call) {
 		try {
 			final Method getter = call.getValue().getClass().getMethod("get" + this.property, new Class<?>[0]);
-			String componentName = (String) getter.invoke(call.getValue(), new Object[0]);
+			String operationName = (String) getter.invoke(call.getValue(), new Object[0]);
 
 			if (PropertiesModel.getInstance().getOperationNames() == OperationNames.SHORT) {
-				componentName = NameConverter.toShortComponentName(componentName);
+				operationName = NameConverter.toShortOperationName(operationName);
 			}
 
-			return new ReadOnlyObjectWrapper<String>(componentName);
+			return new ReadOnlyObjectWrapper<String>(operationName);
 		} catch (final NullPointerException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
 			LOGGER.warn(ex);
 			return null;
diff --git a/src/main/java/kieker/diagnosis/mainview/subview/util/OperationTreeCellValueFactory.java b/src/main/java/kieker/diagnosis/mainview/subview/util/OperationTreeCellValueFactory.java
index 42e70418d613b4ec0883ff4f33e4f9fb0bab25e3..96aedf3b287077105e2fa2e92971737287a491a6 100644
--- a/src/main/java/kieker/diagnosis/mainview/subview/util/OperationTreeCellValueFactory.java
+++ b/src/main/java/kieker/diagnosis/mainview/subview/util/OperationTreeCellValueFactory.java
@@ -31,13 +31,13 @@ public class OperationTreeCellValueFactory implements Callback<CellDataFeatures<
 		try {
 			final TreeItem<?> item = (call.getValue());
 			final Method getter = item.getValue().getClass().getMethod("get" + this.property, new Class<?>[0]);
-			String componentName = (String) getter.invoke(item.getValue(), new Object[0]);
+			String operationName = (String) getter.invoke(item.getValue(), new Object[0]);
 
 			if (PropertiesModel.getInstance().getOperationNames() == OperationNames.SHORT) {
-				componentName = NameConverter.toShortComponentName(componentName);
+				operationName = NameConverter.toShortOperationName(operationName);
 			}
 
-			return new ReadOnlyObjectWrapper<String>(componentName);
+			return new ReadOnlyObjectWrapper<String>(operationName);
 		} catch (final NullPointerException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
 			LOGGER.warn(ex);
 			return null;