diff --git a/include/Nazara/Physics/Geom.hpp b/include/Nazara/Physics/Geom.hpp
index 1a82f8445..3db143292 100644
--- a/include/Nazara/Physics/Geom.hpp
+++ b/include/Nazara/Physics/Geom.hpp
@@ -190,22 +190,22 @@ namespace Nz
 			unsigned int m_vertexStride;
 	};
 
-	class NzCylinderGeom;
+	class CylinderGeom;
 
-	using NzCylinderGeomConstRef = ObjectRef<const NzCylinderGeom>;
-	using NzCylinderGeomRef = ObjectRef<NzCylinderGeom>;
+	using CylinderGeomConstRef = ObjectRef<const CylinderGeom>;
+	using CylinderGeomRef = ObjectRef<CylinderGeom>;
 
-	class NAZARA_PHYSICS_API NzCylinderGeom : public PhysGeom
+	class NAZARA_PHYSICS_API CylinderGeom : public PhysGeom
 	{
 		public:
-			NzCylinderGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
-			NzCylinderGeom(float length, float radius, const Vector3f& translation, const Quaternionf& rotation = Quaternionf::Identity());
+			CylinderGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
+			CylinderGeom(float length, float radius, const Vector3f& translation, const Quaternionf& rotation = Quaternionf::Identity());
 
 			float GetLength() const;
 			float GetRadius() const;
 			GeomType GetType() const override;
 
-			template<typename... Args> static NzCylinderGeomRef New(Args&&... args);
+			template<typename... Args> static CylinderGeomRef New(Args&&... args);
 
 		private:
 			NewtonCollision* CreateHandle(PhysWorld* world) const override;
diff --git a/include/Nazara/Physics/Geom.inl b/include/Nazara/Physics/Geom.inl
index 1489348ac..9699cac96 100644
--- a/include/Nazara/Physics/Geom.inl
+++ b/include/Nazara/Physics/Geom.inl
@@ -53,9 +53,9 @@ namespace Nz
 	}
 
 	template<typename... Args>
-	NzCylinderGeomRef NzCylinderGeom::New(Args&&... args)
+	CylinderGeomRef CylinderGeom::New(Args&&... args)
 	{
-		std::unique_ptr<NzCylinderGeom> object(new NzCylinderGeom(std::forward<Args>(args)...));
+		std::unique_ptr<CylinderGeom> object(new CylinderGeom(std::forward<Args>(args)...));
 		object->SetPersistent(false);
 
 		return object.release();
diff --git a/include/Nazara/Renderer/RenderStates.inl b/include/Nazara/Renderer/RenderStates.inl
index 498cdee56..6840d3b5f 100644
--- a/include/Nazara/Renderer/RenderStates.inl
+++ b/include/Nazara/Renderer/RenderStates.inl
@@ -29,11 +29,11 @@ namespace Nz
 			Face& face = (i == 0) ? backFace : frontFace;
 
 			face.stencilCompare = RendererComparison_Always;
-			face.stencilFail = nzStencilOperation_Keep;
+			face.stencilFail = StencilOperation_Keep;
 			face.stencilMask = 0xFFFFFFFF;
-			face.stencilPass = nzStencilOperation_Keep;
+			face.stencilPass = StencilOperation_Keep;
 			face.stencilReference = 0;
-			face.stencilZFail = nzStencilOperation_Keep;
+			face.stencilZFail = StencilOperation_Keep;
 		}
 	}