3 files changed, 17 insertions, 17 deletions

diff --git a/source/blender/nodes/shader/nodes/node_shader_output_metallic.c b/source/blender/nodes/shader/nodes/node_shader_eevee_metallic.c
index cb2c06268d2..23e927fa99b 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_metallic.c
+++ b/source/blender/nodes/shader/nodes/node_shader_eevee_metallic.c
@@ -29,7 +29,7 @@
 
 /* **************** OUTPUT ******************** */
 
-static bNodeSocketTemplate sh_node_output_metallic_in[] = {
+static bNodeSocketTemplate sh_node_eevee_metallic_in[] = {
 	{	SOCK_RGBA, 1, N_("Base Color"),				0.8f, 0.8f, 0.8f, 1.0f},
 	{	SOCK_FLOAT, 1, N_("Metallic"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	SOCK_FLOAT, 1, N_("Specular"),				0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
@@ -44,12 +44,12 @@ static bNodeSocketTemplate sh_node_output_metallic_in[] = {
 	{	-1, 0, ""	}
 };
 
-static bNodeSocketTemplate sh_node_output_metallic_out[] = {
+static bNodeSocketTemplate sh_node_eevee_metallic_out[] = {
 	{	SOCK_SHADER, 0, N_("BSDF")},
 	{	-1, 0, ""	}
 };
 
-static int node_shader_gpu_output_metallic(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
+static int node_shader_gpu_eevee_metallic(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
 {
 	static float one = 1.0f;
 
@@ -68,21 +68,21 @@ static int node_shader_gpu_output_metallic(GPUMaterial *mat, bNode *UNUSED(node)
 		GPU_link(mat, "set_value", GPU_uniform(&one), &in[10].link);
 	}
 
-	return GPU_stack_link(mat, "node_output_metallic", in, out);
+	return GPU_stack_link(mat, "node_eevee_metallic", in, out);
 }
 
 
 /* node type definition */
-void register_node_type_sh_output_metallic(void)
+void register_node_type_sh_eevee_metallic(void)
 {
 	static bNodeType ntype;
 
-	sh_node_type_base(&ntype, SH_NODE_OUTPUT_METALLIC, "Metallic Material Output", NODE_CLASS_SHADER, 0);
+	sh_node_type_base(&ntype, SH_NODE_EEVEE_METALLIC, "Metallic", NODE_CLASS_SHADER, 0);
 	node_type_compatibility(&ntype, NODE_NEW_SHADING);
-	node_type_socket_templates(&ntype, sh_node_output_metallic_in, sh_node_output_metallic_out);
+	node_type_socket_templates(&ntype, sh_node_eevee_metallic_in, sh_node_eevee_metallic_out);
 	node_type_init(&ntype, NULL);
 	node_type_storage(&ntype, "", NULL, NULL);
-	node_type_gpu(&ntype, node_shader_gpu_output_metallic);
+	node_type_gpu(&ntype, node_shader_gpu_eevee_metallic);
 
 	nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_specular.c b/source/blender/nodes/shader/nodes/node_shader_eevee_specular.c
index 218a4357205..b8389814027 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_specular.c
+++ b/source/blender/nodes/shader/nodes/node_shader_eevee_specular.c
@@ -29,7 +29,7 @@
 
 /* **************** OUTPUT ******************** */
 
-static bNodeSocketTemplate sh_node_output_specular_in[] = {
+static bNodeSocketTemplate sh_node_eevee_specular_in[] = {
 	{	SOCK_RGBA, 1, N_("Base Color"),				0.8f, 0.8f, 0.8f, 1.0f},
 	{	SOCK_RGBA, 1, N_("Specular"),				0.03f, 0.03f, 0.03f, 1.0f},
 	{	SOCK_FLOAT, 1, N_("Roughness"),				0.2f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
@@ -43,12 +43,12 @@ static bNodeSocketTemplate sh_node_output_specular_in[] = {
 	{	-1, 0, ""	}
 };
 
-static bNodeSocketTemplate sh_node_output_specular_out[] = {
+static bNodeSocketTemplate sh_node_eevee_specular_out[] = {
 	{	SOCK_SHADER, 0, N_("BSDF")},
 	{	-1, 0, ""	}
 };
 
-static int node_shader_gpu_output_specular(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
+static int node_shader_gpu_eevee_specular(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
 {
 	static float one = 1.0f;
 
@@ -67,21 +67,21 @@ static int node_shader_gpu_output_specular(GPUMaterial *mat, bNode *UNUSED(node)
 		GPU_link(mat, "set_value", GPU_uniform(&one), &in[9].link);
 	}
 
-	return GPU_stack_link(mat, "node_output_specular", in, out);
+	return GPU_stack_link(mat, "node_eevee_specular", in, out);
 }
 
 
 /* node type definition */
-void register_node_type_sh_output_specular(void)
+void register_node_type_sh_eevee_specular(void)
 {
 	static bNodeType ntype;
 
-	sh_node_type_base(&ntype, SH_NODE_OUTPUT_SPECULAR, "Specular Material Output", NODE_CLASS_SHADER, 0);
+	sh_node_type_base(&ntype, SH_NODE_EEVEE_SPECULAR, "Specular", NODE_CLASS_SHADER, 0);
 	node_type_compatibility(&ntype, NODE_NEW_SHADING);
-	node_type_socket_templates(&ntype, sh_node_output_specular_in, sh_node_output_specular_out);
+	node_type_socket_templates(&ntype, sh_node_eevee_specular_in, sh_node_eevee_specular_out);
 	node_type_init(&ntype, NULL);
 	node_type_storage(&ntype, "", NULL, NULL);
-	node_type_gpu(&ntype, node_shader_gpu_output_specular);
+	node_type_gpu(&ntype, node_shader_gpu_eevee_specular);
 
 	nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_eevee_material.c b/source/blender/nodes/shader/nodes/node_shader_output_eevee_material.c
index dcb7ada5a7a..ef3bf0e28d5 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_eevee_material.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output_eevee_material.c
@@ -52,7 +52,7 @@ void register_node_type_sh_output_eevee_material(void)
 {
 	static bNodeType ntype;
 
-	sh_node_type_base(&ntype, SH_NODE_OUTPUT_EEVEE_MATERIAL, "Eevee Material Output", NODE_CLASS_OUTPUT, 0);
+	sh_node_type_base(&ntype, SH_NODE_OUTPUT_EEVEE_MATERIAL, "Material Output", NODE_CLASS_OUTPUT, 0);
 	node_type_compatibility(&ntype, NODE_NEW_SHADING);
 	node_type_socket_templates(&ntype, sh_node_output_eevee_material_in, NULL);
 	node_type_init(&ntype, NULL);