diff --git a/library/PolyVoxCore/include/PolyVoxCore/Density.h b/library/PolyVoxCore/include/PolyVoxCore/Density.h
index da0d14c7..a5e74616 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Density.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Density.h
@@ -42,12 +42,12 @@ namespace PolyVox
 	///
 	/// \sa Material, MaterialDensityPair
 	////////////////////////////////////////////////////////////////////////////////
-	template <typename Type>
+	template <typename DensityType>
 	class Density
 	{
 	public:
 		Density() : m_uDensity(0) {}
-		Density(Type uDensity) : m_uDensity(uDensity) {}
+		Density(DensityType uDensity) : m_uDensity(uDensity) {}
 
 		bool operator==(const Density& rhs) const throw()
 		{
@@ -59,18 +59,18 @@ namespace PolyVox
 			return !(*this == rhs);
 		}
 
-		Type getDensity() const throw() { return m_uDensity; }
-		Type getMaterial() const throw() { return 1; }
+		DensityType getDensity() const throw() { return m_uDensity; }
+		uint32_t getMaterial() const throw() { return 1; }
 
-		void setDensity(Type uDensity) { m_uDensity = uDensity; }
-		void setMaterial(Type uMaterial) { assert(false); } //Cannot set material on voxel of type Density
+		void setDensity(DensityType uDensity) { m_uDensity = uDensity; }
+		void setMaterial(uint32_t uMaterial) { assert(false); } //Cannot set material on voxel of type Density
 
-		static Type getMaxDensity() throw() { return (0x01 << (sizeof(Type) * 8)) - 1; } 
-		static Type getMinDensity() throw() { return 0; }
-		static Type getThreshold() throw() {return  0x01 << ((sizeof(Type) * 8) - 1);}
+		static DensityType getMaxDensity() throw() { return (0x01 << (sizeof(DensityType) * 8)) - 1; } 
+		static DensityType getMinDensity() throw() { return 0; }
+		static DensityType getThreshold() throw() {return  0x01 << ((sizeof(DensityType) * 8) - 1);}
 
 	private:
-		Type m_uDensity;
+		DensityType m_uDensity;
 	};
 
 	typedef Density<uint8_t> Density8;
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Material.h b/library/PolyVoxCore/include/PolyVoxCore/Material.h
index 445961b0..09d978e9 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Material.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Material.h
@@ -43,12 +43,12 @@ namespace PolyVox
 	///
 	/// \sa Density, MaterialDensityPair
 	////////////////////////////////////////////////////////////////////////////////
-	template <typename Type>
+	template <typename MaterialType>
 	class Material
 	{
 	public:
 		Material() : m_uMaterial(0) {}
-		Material(Type uMaterial) : m_uMaterial(uMaterial) {}
+		Material(MaterialType uMaterial) : m_uMaterial(uMaterial) {}
 
 		bool operator==(const Material& rhs) const throw()
 		{
@@ -60,7 +60,7 @@ namespace PolyVox
 			return !(*this == rhs);
 		}
 
-		Type getDensity() const throw()
+		uint32_t getDensity() const throw()
 		{
 			//We don't actually have a density, so make one up based on the material.
 			if(m_uMaterial == 0)
@@ -73,17 +73,17 @@ namespace PolyVox
 			}
 		}
 
-		Type getMaterial() const throw() { return m_uMaterial; }
+		MaterialType getMaterial() const throw() { return m_uMaterial; }
 
-		void setDensity(Type /*uDensity*/) { assert(false); } //Cannot set density on voxel of type Material
-		void setMaterial(Type uMaterial) { m_uMaterial = uMaterial; }
+		void setDensity(uint32_t /*uDensity*/) { assert(false); } //Cannot set density on voxel of type Material
+		void setMaterial(MaterialType uMaterial) { m_uMaterial = uMaterial; }
 
-		static Type getMaxDensity() throw() { return 2; }
-		static Type getMinDensity() throw() { return 0; }
-		static Type getThreshold() throw() { return 1; }
+		static uint32_t getMaxDensity() throw() { return 2; }
+		static uint32_t getMinDensity() throw() { return 0; }
+		static uint32_t getThreshold() throw() { return 1; }
 
 	private:
-		Type m_uMaterial;
+		MaterialType m_uMaterial;
 	};
 
 	typedef Material<uint8_t> Material8;