diff --git a/include/Nazara/Renderer/GlslWriter.hpp b/include/Nazara/Renderer/GlslWriter.hpp
index b17e4aab2..ce9d46420 100644
--- a/include/Nazara/Renderer/GlslWriter.hpp
+++ b/include/Nazara/Renderer/GlslWriter.hpp
@@ -47,7 +47,7 @@ namespace Nz
 			struct Function;
 			using VariableContainer = std::set<std::pair<ShaderAst::ExpressionType, String>>;
 
-			void Append(ShaderAst::Builtin builtin);
+			void Append(ShaderAst::BuiltinEntry builtin);
 			void Append(ShaderAst::ExpressionType type);
 			void Append(const String& txt);
 			void AppendCommentSection(const String& section);
diff --git a/include/Nazara/Renderer/ShaderAst.hpp b/include/Nazara/Renderer/ShaderAst.hpp
index 52ad7eb5d..831241853 100644
--- a/include/Nazara/Renderer/ShaderAst.hpp
+++ b/include/Nazara/Renderer/ShaderAst.hpp
@@ -37,7 +37,7 @@ namespace Nz
 			Equality   //< ==
 		};
 
-		enum class Builtin
+		enum class BuiltinEntry
 		{
 			VertexPosition, // gl_Position
 		};
@@ -157,12 +157,12 @@ namespace Nz
 		class NAZARA_RENDERER_API BuiltinVariable : public Variable
 		{
 			public:
-				inline BuiltinVariable(Builtin variable, ExpressionType varType);
+				inline BuiltinVariable(BuiltinEntry variable, ExpressionType varType);
 
 				void Register(ShaderWriter& visitor) override;
 				void Visit(ShaderWriter& visitor) override;
 
-				Builtin var;
+				BuiltinEntry var;
 		};
 
 		//////////////////////////////////////////////////////////////////////////
diff --git a/include/Nazara/Renderer/ShaderAst.inl b/include/Nazara/Renderer/ShaderAst.inl
index a334a1bd1..f59c9f972 100644
--- a/include/Nazara/Renderer/ShaderAst.inl
+++ b/include/Nazara/Renderer/ShaderAst.inl
@@ -69,7 +69,7 @@ namespace Nz
 		{
 		}
 
-		inline BuiltinVariable::BuiltinVariable(Builtin variable, ExpressionType varType) :
+		inline BuiltinVariable::BuiltinVariable(BuiltinEntry variable, ExpressionType varType) :
 		Variable(VariableType::Builtin, varType),
 		var(variable)
 		{
diff --git a/include/Nazara/Renderer/ShaderBuilder.hpp b/include/Nazara/Renderer/ShaderBuilder.hpp
index b92ad78cb..4f9c6a1fe 100644
--- a/include/Nazara/Renderer/ShaderBuilder.hpp
+++ b/include/Nazara/Renderer/ShaderBuilder.hpp
@@ -27,7 +27,7 @@ namespace Nz { namespace ShaderBuilder
 
 	struct BuiltinBuilder
 	{
-		std::shared_ptr<ShaderAst::Variable> operator()(ShaderAst::Builtin builtin) const;
+		std::shared_ptr<ShaderAst::Variable> operator()(ShaderAst::BuiltinEntry builtin) const;
 	};
 
 	template<typename T>
diff --git a/include/Nazara/Renderer/ShaderBuilder.inl b/include/Nazara/Renderer/ShaderBuilder.inl
index 4b62b5483..6778eb615 100644
--- a/include/Nazara/Renderer/ShaderBuilder.inl
+++ b/include/Nazara/Renderer/ShaderBuilder.inl
@@ -26,13 +26,13 @@ namespace Nz { namespace ShaderBuilder
 		return std::make_shared<ShaderAst::BinaryOp>(op, left, right);
 	}
 
-	std::shared_ptr<ShaderAst::Variable> BuiltinBuilder::operator()(ShaderAst::Builtin builtin) const
+	std::shared_ptr<ShaderAst::Variable> BuiltinBuilder::operator()(ShaderAst::BuiltinEntry builtin) const
 	{
 		ShaderAst::ExpressionType exprType = ShaderAst::ExpressionType::None;
 
 		switch (builtin)
 		{
-			case ShaderAst::Builtin::VertexPosition:
+			case ShaderAst::BuiltinEntry::VertexPosition:
 				exprType = ShaderAst::ExpressionType::Float4;
 				break;
 		}
diff --git a/src/Nazara/Renderer/GlslWriter.cpp b/src/Nazara/Renderer/GlslWriter.cpp
index 28dac120c..b910e2519 100644
--- a/src/Nazara/Renderer/GlslWriter.cpp
+++ b/src/Nazara/Renderer/GlslWriter.cpp
@@ -274,11 +274,11 @@ namespace Nz
 		}
 	}
 
-	void GlslWriter::Append(ShaderAst::Builtin builtin)
+	void GlslWriter::Append(ShaderAst::BuiltinEntry builtin)
 	{
 		switch (builtin)
 		{
-			case ShaderAst::Builtin::VertexPosition:
+			case ShaderAst::BuiltinEntry::VertexPosition:
 				Append("gl_Position");
 				break;
 		}