diff --git a/src/Classes/Layers/BaseLayer.gd b/src/Classes/Layers/BaseLayer.gd
index b4577c4b7..18f2d68b2 100644
--- a/src/Classes/Layers/BaseLayer.gd
+++ b/src/Classes/Layers/BaseLayer.gd
@@ -236,8 +236,8 @@ func display_effects(cel: BaseCel, image_override: Image = null) -> Image:
 			continue
 		var params := effect.params
 		params["PXO_time"] = cel.get_frame(project).position_in_seconds(project)
-		params["PXO_frame"] = project.frames.find(cel.get_frame(project))
-		params["PXO_layer"] = index
+		params["PXO_frame_index"] = project.frames.find(cel.get_frame(project))
+		params["PXO_layer_index"] = index
 		var shader_image_effect := ShaderImageEffect.new()
 		shader_image_effect.generate_image(image, effect.shader, params, image_size)
 	# Inherit effects from the parents, if their blend mode is set to pass through
diff --git a/src/Classes/ShaderLoader.gd b/src/Classes/ShaderLoader.gd
index 97f706dad..b1399ae6c 100644
--- a/src/Classes/ShaderLoader.gd
+++ b/src/Classes/ShaderLoader.gd
@@ -63,7 +63,7 @@ static func create_ui_for_shader_uniforms(
 		var u_init := u_left_side[0].split(" ")
 		var u_type := u_init[1]
 		var u_name := u_init[2]
-		if u_name in ["PXO_time", "PXO_frame", "PXO_layer"]:
+		if u_name in ["PXO_time", "PXO_frame_index", "PXO_layer_index"]:
 			continue
 		# Find custom data of the uniform, if any exists
 		# Right now it only checks if a uniform should have another type of node
diff --git a/src/UI/Timeline/LayerEffects/LayerEffectsSettings.gd b/src/UI/Timeline/LayerEffects/LayerEffectsSettings.gd
index 114acaf1e..ce1b96bdc 100644
--- a/src/UI/Timeline/LayerEffects/LayerEffectsSettings.gd
+++ b/src/UI/Timeline/LayerEffects/LayerEffectsSettings.gd
@@ -180,8 +180,8 @@ func _apply_effect(layer: BaseLayer, effect: LayerEffect) -> void:
 		var image_size := cel_image.get_size()
 		var params := effect.params
 		params["PXO_time"] = frame.position_in_seconds(project)
-		params["PXO_frame"] = i
-		params["PXO_layer"] = layer.index
+		params["PXO_frame_index"] = i
+		params["PXO_layer_index"] = layer.index
 		var shader_image_effect := ShaderImageEffect.new()
 		shader_image_effect.generate_image(cel_image, effect.shader, params, image_size)