diff --git a/include/Nazara/Shader/ShaderBuilder.hpp b/include/Nazara/Shader/ShaderBuilder.hpp
index 03ac51ac2..61dab693e 100644
--- a/include/Nazara/Shader/ShaderBuilder.hpp
+++ b/include/Nazara/Shader/ShaderBuilder.hpp
@@ -55,7 +55,7 @@ namespace Nz::ShaderBuilder
 	constexpr GenBuilder<ShaderNodes::Constant> Constant;
 	constexpr GenBuilder<ShaderNodes::DeclareVariable> DeclareVariable;
 	constexpr GenBuilder<ShaderNodes::Discard> Discard;
-	constexpr BinOpBuilder<ShaderNodes::BinaryType::Divide> Divide;
+	constexpr BinOpBuilder<ShaderNodes::BinaryType::Divide> Division;
 	constexpr BinOpBuilder<ShaderNodes::BinaryType::CompEq> Equal;
 	constexpr BinOpBuilder<ShaderNodes::BinaryType::CompGt> GreaterThan;
 	constexpr BinOpBuilder<ShaderNodes::BinaryType::CompGe> GreaterThanOrEqual;
@@ -71,8 +71,9 @@ namespace Nz::ShaderBuilder
 	constexpr GenBuilder<ShaderNodes::OutputVariable> Output;
 	constexpr GenBuilder<ShaderNodes::ParameterVariable> Parameter;
 	constexpr GenBuilder<ShaderNodes::Sample2D> Sample2D;
+	constexpr GenBuilder<ShaderNodes::StatementBlock> StatementBlock;
 	constexpr GenBuilder<ShaderNodes::SwizzleOp> Swizzle;
-	constexpr BinOpBuilder<ShaderNodes::BinaryType::Substract> Substract;
+	constexpr BinOpBuilder<ShaderNodes::BinaryType::Subtract> Subtract;
 	constexpr GenBuilder<ShaderNodes::UniformVariable> Uniform;
 
 	template<ShaderNodes::BasicType Type, typename... Args> std::shared_ptr<ShaderNodes::Cast> Cast(Args&&... args);
diff --git a/include/Nazara/Shader/ShaderEnums.hpp b/include/Nazara/Shader/ShaderEnums.hpp
index ccb2f78d5..557b31ffa 100644
--- a/include/Nazara/Shader/ShaderEnums.hpp
+++ b/include/Nazara/Shader/ShaderEnums.hpp
@@ -39,7 +39,7 @@ namespace Nz::ShaderNodes
 	enum class BinaryType
 	{
 		Add,       //< +
-		Substract, //< -
+		Subtract, //< -
 		Multiply,  //< *
 		Divide,    //< /
 
diff --git a/src/Nazara/Shader/GlslWriter.cpp b/src/Nazara/Shader/GlslWriter.cpp
index 0dfe2476c..49fa07aa3 100644
--- a/src/Nazara/Shader/GlslWriter.cpp
+++ b/src/Nazara/Shader/GlslWriter.cpp
@@ -420,7 +420,7 @@ namespace Nz
 		switch (node.op)
 		{
 			case ShaderNodes::BinaryType::Add:       Append(" + "); break;
-			case ShaderNodes::BinaryType::Substract: Append(" - "); break;
+			case ShaderNodes::BinaryType::Subtract: Append(" - "); break;
 			case ShaderNodes::BinaryType::Multiply:  Append(" * "); break;
 			case ShaderNodes::BinaryType::Divide:    Append(" / "); break;
 
diff --git a/src/Nazara/Shader/ShaderAstValidator.cpp b/src/Nazara/Shader/ShaderAstValidator.cpp
index e139fa25e..90f8aeef2 100644
--- a/src/Nazara/Shader/ShaderAstValidator.cpp
+++ b/src/Nazara/Shader/ShaderAstValidator.cpp
@@ -161,7 +161,7 @@ namespace Nz
 			case ShaderNodes::BinaryType::Add:
 			case ShaderNodes::BinaryType::CompEq:
 			case ShaderNodes::BinaryType::CompNe:
-			case ShaderNodes::BinaryType::Substract:
+			case ShaderNodes::BinaryType::Subtract:
 				TypeMustMatch(node.left, node.right);
 				break;
 
diff --git a/src/Nazara/Shader/ShaderNodes.cpp b/src/Nazara/Shader/ShaderNodes.cpp
index 2aa00ec69..05a59ab96 100644
--- a/src/Nazara/Shader/ShaderNodes.cpp
+++ b/src/Nazara/Shader/ShaderNodes.cpp
@@ -97,7 +97,7 @@ namespace Nz::ShaderNodes
 		switch (op)
 		{
 			case BinaryType::Add:
-			case BinaryType::Substract:
+			case BinaryType::Subtract:
 				exprType = left->GetExpressionType();
 				break;
 
diff --git a/src/Nazara/Shader/SpirvAstVisitor.cpp b/src/Nazara/Shader/SpirvAstVisitor.cpp
index f76c8807c..da172fb44 100644
--- a/src/Nazara/Shader/SpirvAstVisitor.cpp
+++ b/src/Nazara/Shader/SpirvAstVisitor.cpp
@@ -92,7 +92,7 @@ namespace Nz
 					break;
 				}
 
-				case ShaderNodes::BinaryType::Substract:
+				case ShaderNodes::BinaryType::Subtract:
 				{
 					switch (leftType)
 					{
diff --git a/src/ShaderNode/DataModels/BinOp.hpp b/src/ShaderNode/DataModels/BinOp.hpp
index 8efb9fc6e..a4ac0a189 100644
--- a/src/ShaderNode/DataModels/BinOp.hpp
+++ b/src/ShaderNode/DataModels/BinOp.hpp
@@ -65,10 +65,10 @@ class BinMul : public BinOp<DataType, Nz::ShaderNodes::BinaryType::Multiply>
 };
 
 template<typename DataType>
-class BinSub : public BinOp<DataType, Nz::ShaderNodes::BinaryType::Substract>
+class BinSub : public BinOp<DataType, Nz::ShaderNodes::BinaryType::Subtract>
 {
 	public:
-		using BinOp<DataType, Nz::ShaderNodes::BinaryType::Substract>::BinOp;
+		using BinOp<DataType, Nz::ShaderNodes::BinaryType::Subtract>::BinOp;
 
 		void ApplyOp(const Nz::Vector4f* left, const Nz::Vector4f* right, Nz::Vector4f* output, std::size_t pixelCount) override;
 		QString GetOperationString() const final;
diff --git a/src/ShaderNode/DataModels/Mat4BinOp.hpp b/src/ShaderNode/DataModels/Mat4BinOp.hpp
index 1cd7e06dd..1d6d71eee 100644
--- a/src/ShaderNode/DataModels/Mat4BinOp.hpp
+++ b/src/ShaderNode/DataModels/Mat4BinOp.hpp
@@ -53,10 +53,10 @@ class Mat4Mul : public Mat4BinOp<Nz::ShaderNodes::BinaryType::Multiply>
 		QString name() const override;
 };
 
-class Mat4Sub : public Mat4BinOp<Nz::ShaderNodes::BinaryType::Substract>
+class Mat4Sub : public Mat4BinOp<Nz::ShaderNodes::BinaryType::Subtract>
 {
 	public:
-		using Mat4BinOp<Nz::ShaderNodes::BinaryType::Substract>::Mat4BinOp;
+		using Mat4BinOp<Nz::ShaderNodes::BinaryType::Subtract>::Mat4BinOp;
 
 		QString caption() const override;
 		QString name() const override;