diff --git a/include/PolyVox/AmbientOcclusionCalculator.h b/include/PolyVox/AmbientOcclusionCalculator.h
index 2560127d..bdd10de7 100644
--- a/include/PolyVox/AmbientOcclusionCalculator.h
+++ b/include/PolyVox/AmbientOcclusionCalculator.h
@@ -33,7 +33,7 @@ freely, subject to the following restrictions:
 
 //These two should not be here!
 #include "PolyVox/Material.h"
-#include "PolyVox/PagedVolume.h"
+#include "PolyVox/RawVolume.h"
 
 #include <algorithm>
 
@@ -53,7 +53,7 @@ namespace PolyVox
 		{
 		}
 
-		bool operator()(const PagedVolume<uint8_t>::Sampler& sampler)
+		bool operator()(const RawVolume<uint8_t>::Sampler& sampler)
 		{
 			uint8_t sample = sampler.getVoxel();
 			bool func = mIsVoxelTransparentCallback(sample);
diff --git a/tests/TestAmbientOcclusionGenerator.cpp b/tests/TestAmbientOcclusionGenerator.cpp
index dcdab847..683d5c98 100644
--- a/tests/TestAmbientOcclusionGenerator.cpp
+++ b/tests/TestAmbientOcclusionGenerator.cpp
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #include "TestAmbientOcclusionGenerator.h"
 
 #include "PolyVox/AmbientOcclusionCalculator.h"
-#include "PolyVox/PagedVolume.h"
+#include "PolyVox/RawVolume.h"
 
 #include <QtTest>
 
@@ -49,7 +49,7 @@ void TestAmbientOcclusionGenerator::testExecute()
 	const int32_t g_uVolumeSideLength = 64;
 
 	//Create empty volume
-	PagedVolume<uint8_t> volData;
+	RawVolume<uint8_t> volData(Region(0, 0, 0, g_uVolumeSideLength - 1, g_uVolumeSideLength - 1, g_uVolumeSideLength - 1));
 
 	//Create two solid walls at opposite sides of the volume
 	for (int32_t z = 0; z < g_uVolumeSideLength; z++)