diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index 80d1e06903..b269aff807 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -139,6 +139,32 @@ function getAiNodesBySubcategory(nodes: INodeTypeDescription[], subcategory: str
 		.sort((a, b) => a.properties.displayName.localeCompare(b.properties.displayName));
 }
 
+function getEvaluationNode(
+	nodeTypesStore: ReturnType<typeof useNodeTypesStore>,
+	isEvaluationVariantEnabled: boolean,
+) {
+	const evaluationNodeStore = nodeTypesStore.getNodeType('n8n-nodes-base.evaluation');
+
+	if (!isEvaluationVariantEnabled || !evaluationNodeStore) {
+		return [];
+	}
+
+	const evaluationNode = getNodeView(evaluationNodeStore);
+
+	return [
+		{
+			...evaluationNode,
+			properties: {
+				...evaluationNode.properties,
+				defaults: {
+					name: 'Evaluation',
+					color: '#c3c9d5',
+				},
+			},
+		},
+	];
+}
+
 export function AIView(_nodes: SimplifiedNodeType[]): NodeView {
 	const i18n = useI18n();
 	const nodeTypesStore = useNodeTypesStore();
@@ -150,9 +176,7 @@ export function AIView(_nodes: SimplifiedNodeType[]): NodeView {
 		EVALUATION_TRIGGER.variant,
 	);
 
-	const evaluationNodeStore = nodeTypesStore.getNodeType('n8n-nodes-base.evaluation');
-	const evaluationNode =
-		isEvaluationVariantEnabled && evaluationNodeStore ? [getNodeView(evaluationNodeStore)] : [];
+	const evaluationNode = getEvaluationNode(nodeTypesStore, isEvaluationVariantEnabled);
 
 	const chainNodes = getAiNodesBySubcategory(nodeTypesStore.allLatestNodeTypes, AI_CATEGORY_CHAINS);
 	const agentNodes = getAiNodesBySubcategory(nodeTypesStore.allLatestNodeTypes, AI_CATEGORY_AGENTS);
@@ -358,9 +382,13 @@ export function TriggerView() {
 				properties: {
 					group: [],
 					name: EVALUATION_TRIGGER_NODE_TYPE,
-					displayName: 'Evaluation Trigger',
+					displayName: 'When running evaluation',
 					description: 'Run a dataset through your workflow to test performance',
 					icon: 'fa:check-double',
+					defaults: {
+						name: 'Evaluation',
+						color: '#c3c9d5',
+					},
 				},
 			}
 		: null;
diff --git a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
index 08ba513b5d..8f171d628d 100644
--- a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
@@ -1299,7 +1299,7 @@
 	"nodeCreator.triggerHelperPanel.whatHappensNext": "What happens next?",
 	"nodeCreator.triggerHelperPanel.selectATrigger": "What triggers this workflow?",
 	"nodeCreator.triggerHelperPanel.selectATriggerDescription": "A trigger is a step that starts your workflow",
-	"nodeCreator.triggerHelperPanel.workflowTriggerDisplayName": "When Executed by Another Workflow",
+	"nodeCreator.triggerHelperPanel.workflowTriggerDisplayName": "When executed by another workflow",
 	"nodeCreator.triggerHelperPanel.workflowTriggerDescription": "Runs the flow when called by the Execute Workflow node from a different workflow",
 	"nodeCreator.aiPanel.aiNodes": "AI Nodes",
 	"nodeCreator.aiPanel.aiOtherNodes": "Other AI Nodes",
diff --git a/packages/nodes-base/nodes/Evaluation/Evaluation/Description.node.ts b/packages/nodes-base/nodes/Evaluation/Evaluation/Description.node.ts
index d5a9fb07c0..3d2886c226 100644
--- a/packages/nodes-base/nodes/Evaluation/Evaluation/Description.node.ts
+++ b/packages/nodes-base/nodes/Evaluation/Evaluation/Description.node.ts
@@ -11,6 +11,7 @@ export const setOutputProperties: INodeProperties[] = [
 	},
 	{
 		...document,
+		displayName: 'Document Containing Dataset',
 		displayOptions: {
 			show: {
 				operation: ['setOutputs'],
@@ -19,6 +20,7 @@ export const setOutputProperties: INodeProperties[] = [
 	},
 	{
 		...sheet,
+		displayName: 'Sheet Containing Dataset',
 		displayOptions: {
 			show: {
 				operation: ['setOutputs'],
diff --git a/packages/nodes-base/nodes/Evaluation/Evaluation/Evaluation.node.ee.ts b/packages/nodes-base/nodes/Evaluation/Evaluation/Evaluation.node.ee.ts
index 26bd2fb473..86b9c27e34 100644
--- a/packages/nodes-base/nodes/Evaluation/Evaluation/Evaluation.node.ee.ts
+++ b/packages/nodes-base/nodes/Evaluation/Evaluation/Evaluation.node.ee.ts
@@ -32,6 +32,9 @@ export class Evaluation implements INodeType {
 		},
 		inputs: [NodeConnectionTypes.Main],
 		outputs: `={{(${setOutputs})($parameter)}}`,
+		codex: {
+			alias: ['Test', 'Metrics', 'Evals', 'Set Output', 'Set Metrics'],
+		},
 		credentials: [
 			{
 				name: 'googleApi',
diff --git a/packages/nodes-base/nodes/Evaluation/EvaluationTrigger/EvaluationTrigger.node.ee.ts b/packages/nodes-base/nodes/Evaluation/EvaluationTrigger/EvaluationTrigger.node.ee.ts
index 6065aac2db..824c2a05b2 100644
--- a/packages/nodes-base/nodes/Evaluation/EvaluationTrigger/EvaluationTrigger.node.ee.ts
+++ b/packages/nodes-base/nodes/Evaluation/EvaluationTrigger/EvaluationTrigger.node.ee.ts
@@ -54,9 +54,10 @@ export class EvaluationTrigger implements INodeType {
 			authentication,
 			{
 				...document,
+				displayName: 'Document Containing Dataset',
 				hint: 'Example dataset format <a href="https://docs.google.com/spreadsheets/d/1vD_IdeFUg7sHsK9okL6Doy1rGOkWTnPJV3Dro4FBUsY/edit?gid=0#gid=0">here</a>',
 			},
-			sheet,
+			{ ...sheet, displayName: 'Sheet Containing Dataset' },
 			{
 				displayName: 'Limit Rows',
 				name: 'limitRows',
@@ -76,6 +77,9 @@ export class EvaluationTrigger implements INodeType {
 			},
 			readFilter,
 		],
+		codex: {
+			alias: ['Test', 'Metrics', 'Evals', 'Set Output', 'Set Metrics'],
+		},
 		credentials: [
 			{
 				name: 'googleApi',
diff --git a/packages/nodes-base/nodes/Evaluation/test/Evaluation.node.test.ts b/packages/nodes-base/nodes/Evaluation/test/Evaluation.node.test.ts
index 024afb6257..00b3a5d128 100644
--- a/packages/nodes-base/nodes/Evaluation/test/Evaluation.node.test.ts
+++ b/packages/nodes-base/nodes/Evaluation/test/Evaluation.node.test.ts
@@ -127,7 +127,7 @@ describe('Test Evaluation', () => {
 
 			const result = await new Evaluation().execute.call(mockExecuteFunctions);
 
-			expect(result).toEqual([]);
+			expect(result).toEqual([[{ json: {} }]]);
 
 			expect(GoogleSheet.prototype.updateRows).not.toBeCalled();
 
diff --git a/packages/nodes-base/nodes/Evaluation/utils/evaluationUtils.ts b/packages/nodes-base/nodes/Evaluation/utils/evaluationUtils.ts
index 46f094f906..c40ba0e074 100644
--- a/packages/nodes-base/nodes/Evaluation/utils/evaluationUtils.ts
+++ b/packages/nodes-base/nodes/Evaluation/utils/evaluationUtils.ts
@@ -25,7 +25,7 @@ export async function setOutput(this: IExecuteFunctions): Promise<INodeExecution
 			message: "No outputs were set since the execution didn't start from an evaluation trigger",
 			location: 'outputPane',
 		});
-		return [];
+		return [this.getInputData()];
 	}
 
 	const outputFields = this.getNodeParameter('outputs.values', 0, []) as Array<{
@@ -107,12 +107,6 @@ export async function setMetrics(this: IExecuteFunctions): Promise<INodeExecutio
 				const assignmentValue =
 					typeof assignment.value === 'number' ? assignment.value : Number(assignment.value);
 
-				if (!assignment.name || isNaN(assignmentValue)) {
-					throw new NodeOperationError(this.getNode(), 'Metric name missing', {
-						description: 'Make sure each metric you define has a name',
-					});
-				}
-
 				if (isNaN(assignmentValue)) {
 					throw new NodeOperationError(
 						this.getNode(),
@@ -123,6 +117,12 @@ export async function setMetrics(this: IExecuteFunctions): Promise<INodeExecutio
 					);
 				}
 
+				if (!assignment.name || isNaN(assignmentValue)) {
+					throw new NodeOperationError(this.getNode(), 'Metric name missing', {
+						description: 'Make sure each metric you define has a name',
+					});
+				}
+
 				const { name, value } = validateEntry(
 					assignment.name,
 					assignment.type as FieldType,