diff --git a/examples/Paging/main.cpp b/examples/Paging/main.cpp
index b4e60974..20a272c6 100644
--- a/examples/Paging/main.cpp
+++ b/examples/Paging/main.cpp
@@ -184,7 +184,7 @@ void createSphereInVolume(LargeVolume<MaterialDensityPair44>& volData, Vector3DF
 					uint8_t uDensity = MaterialDensityPair44::getMaxDensity();
 
 					//Get the old voxel
-					MaterialDensityPair44 voxel = volData.getVoxelAt(x,y,z);
+					MaterialDensityPair44 voxel = volData.getVoxel(x,y,z);
 
 					//Modify the density
 					voxel.setDensity(uDensity);
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
index 67932672..1f7b71d5 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
@@ -52,8 +52,8 @@ namespace PolyVox
 		Block(uint16_t uSideLength = 0);
 
 		uint16_t getSideLength(void) const;
-		VoxelType getVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const;
-		VoxelType getVoxelAt(const Vector3DUint16& v3dPos) const;
+		VoxelType getVoxel(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const;
+		VoxelType getVoxel(const Vector3DUint16& v3dPos) const;
 
 		void setVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos, VoxelType tValue);
 		void setVoxelAt(const Vector3DUint16& v3dPos, VoxelType tValue);
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl b/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
index bb95f584..61c9baac 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
@@ -58,7 +58,7 @@ namespace PolyVox
 	}
 
 	template <typename VoxelType>
-	VoxelType Block<VoxelType>::getVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const
+	VoxelType Block<VoxelType>::getVoxel(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const
 	{
 		// This is internal code not directly called by the user. For efficiency we assert rather than throwing.
 		POLYVOX_ASSERT(uXPos < m_uSideLength, "Supplied position is outside of the block");
@@ -75,9 +75,9 @@ namespace PolyVox
 	}
 
 	template <typename VoxelType>
-	VoxelType Block<VoxelType>::getVoxelAt(const Vector3DUint16& v3dPos) const
+	VoxelType Block<VoxelType>::getVoxel(const Vector3DUint16& v3dPos) const
 	{
-		return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ());
+		return getVoxel(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ());
 	}
 
 	template <typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
index c8f3e0f6..abf3e4ed 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
@@ -216,7 +216,7 @@ namespace PolyVox
 
 			Block<VoxelType>* pUncompressedBlock = getUncompressedBlock(blockX, blockY, blockZ);
 
-			return pUncompressedBlock->getVoxelAt(xOffset,yOffset,zOffset);
+			return pUncompressedBlock->getVoxel(xOffset,yOffset,zOffset);
 		}
 		else
 		{
@@ -804,7 +804,7 @@ namespace PolyVox
 
 		Block<VoxelType>* pUncompressedBlock = getUncompressedBlock(blockX, blockY, blockZ);
 
-		return pUncompressedBlock->getVoxelAt(xOffset,yOffset,zOffset);
+		return pUncompressedBlock->getVoxel(xOffset,yOffset,zOffset);
 	}
 }