diff --git a/benchmark/test_polygon_clipping.cpp b/benchmark/test_polygon_clipping.cpp
index e831420fb..e8c245e2c 100644
--- a/benchmark/test_polygon_clipping.cpp
+++ b/benchmark/test_polygon_clipping.cpp
@@ -3,7 +3,7 @@
 #include "agg_conv_clip_polygon.h"
 #include <mapnik/geometry.hpp>
 #include <mapnik/vertex.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/graphics.hpp>
 #include <mapnik/wkt/wkt_factory.hpp>
 #include <mapnik/wkt/wkt_grammar_impl.hpp>
diff --git a/bindings/python/mapnik_map.cpp b/bindings/python/mapnik_map.cpp
index 5c5ec062b..758df4109 100644
--- a/bindings/python/mapnik_map.cpp
+++ b/bindings/python/mapnik_map.cpp
@@ -34,7 +34,7 @@
 #include <mapnik/layer.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/projection.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/feature_type_style.hpp>
 #include "mapnik_enumeration.hpp"
 
diff --git a/bindings/python/mapnik_view_transform.cpp b/bindings/python/mapnik_view_transform.cpp
index 23295502a..87a8aad23 100644
--- a/bindings/python/mapnik_view_transform.cpp
+++ b/bindings/python/mapnik_view_transform.cpp
@@ -25,7 +25,7 @@
 #include <boost/python.hpp>
 
 // mapnik
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 
 using mapnik::view_transform;
 
diff --git a/demo/viewer/mapwidget.cpp b/demo/viewer/mapwidget.cpp
index 4bfe7cedf..a106934c3 100644
--- a/demo/viewer/mapwidget.cpp
+++ b/demo/viewer/mapwidget.cpp
@@ -26,7 +26,7 @@
 #include <mapnik/layer.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/scale_denominator.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/memory_datasource.hpp>
 #include <mapnik/feature_kv_iterator.hpp>
 //#include <mapnik/config_error.hpp>
diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
index 4bf39f819..4af527db9 100644
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@@ -30,7 +30,7 @@
 #include <mapnik/rule.hpp>              // for rule, symbolizers
 #include <mapnik/box2d.hpp>     // for box2d
 #include <mapnik/color.hpp>     // for color
-#include <mapnik/ctrans.hpp>    // for view_transform
+#include <mapnik/view_transform.hpp>    // for view_transform
 #include <mapnik/image_compositing.hpp>  // for composite_mode_e
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/request.hpp>
diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp
index 86930e6a7..fc760d029 100644
--- a/include/mapnik/grid/grid_renderer.hpp
+++ b/include/mapnik/grid/grid_renderer.hpp
@@ -32,7 +32,7 @@
 #include <mapnik/rule.hpp>              // for rule, symbolizers
 #include <mapnik/box2d.hpp>     // for box2d
 #include <mapnik/color.hpp>     // for color
-#include <mapnik/ctrans.hpp>    // for view_transform
+#include <mapnik/view_transform.hpp>    // for view_transform
 #include <mapnik/image_compositing.hpp>  // for composite_mode_e
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/renderer_common.hpp>
diff --git a/include/mapnik/group/group_symbolizer_helper.hpp b/include/mapnik/group/group_symbolizer_helper.hpp
index 5c771012d..d5cb95b69 100644
--- a/include/mapnik/group/group_symbolizer_helper.hpp
+++ b/include/mapnik/group/group_symbolizer_helper.hpp
@@ -30,7 +30,7 @@
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/text/placement_finder.hpp>
 #include <mapnik/proj_transform.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 
 namespace mapnik {
 
diff --git a/include/mapnik/markers_placements/line.hpp b/include/mapnik/markers_placements/line.hpp
index 1ac2d353b..66cb88603 100644
--- a/include/mapnik/markers_placements/line.hpp
+++ b/include/mapnik/markers_placements/line.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_MARKERS_PLACEMENTS_LINE_HPP
 
 #include <mapnik/markers_placements/point.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/global.hpp> //round
 
diff --git a/include/mapnik/renderer_common.hpp b/include/mapnik/renderer_common.hpp
index 5ab8242c8..71afadb12 100644
--- a/include/mapnik/renderer_common.hpp
+++ b/include/mapnik/renderer_common.hpp
@@ -26,7 +26,7 @@
 #include <mapnik/config.hpp>            // for MAPNIK_DECL
 #include <mapnik/font_engine_freetype.hpp>  // for face_manager, etc
 #include <mapnik/box2d.hpp>     // for box2d
-#include <mapnik/ctrans.hpp>    // for view_transform
+#include <mapnik/view_transform.hpp>    // for view_transform
 #include <mapnik/attribute.hpp>
 
 // fwd declarations to speed up compile
diff --git a/include/mapnik/svg/geometry_svg_generator.hpp b/include/mapnik/svg/geometry_svg_generator.hpp
index eb5dfe678..04b409cba 100644
--- a/include/mapnik/svg/geometry_svg_generator.hpp
+++ b/include/mapnik/svg/geometry_svg_generator.hpp
@@ -27,7 +27,7 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp> // for container stuff
-#include <mapnik/ctrans.hpp> // for container stuff
+#include <mapnik/view_transform.hpp> // for container stuff
 #include <mapnik/util/path_iterator.hpp>
 #include <mapnik/util/container_adapter.hpp>
 
diff --git a/include/mapnik/svg/output/svg_generator.hpp b/include/mapnik/svg/output/svg_generator.hpp
index 197d663ad..e9ff4bd24 100644
--- a/include/mapnik/svg/output/svg_generator.hpp
+++ b/include/mapnik/svg/output/svg_generator.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_SVG_GENERATOR_HPP
 
 // mapnik
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/color.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/svg/geometry_svg_generator.hpp>
diff --git a/include/mapnik/svg/output/svg_path_iterator.hpp b/include/mapnik/svg/output/svg_path_iterator.hpp
index f216cc621..193e4fe14 100644
--- a/include/mapnik/svg/output/svg_path_iterator.hpp
+++ b/include/mapnik/svg/output/svg_path_iterator.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/geometry.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 
 // boost
 #include <boost/iterator/iterator_adaptor.hpp>
diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp
index 136f3663f..e6f2f60ce 100644
--- a/include/mapnik/svg/output/svg_renderer.hpp
+++ b/include/mapnik/svg/output/svg_renderer.hpp
@@ -33,7 +33,7 @@
 #include <mapnik/rule.hpp>              // for rule, symbolizers
 #include <mapnik/box2d.hpp>     // for box2d
 #include <mapnik/color.hpp>     // for color
-#include <mapnik/ctrans.hpp>    // for view_transform
+#include <mapnik/view_transform.hpp>    // for view_transform
 #include <mapnik/image_compositing.hpp>  // for composite_mode_e
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/request.hpp>
diff --git a/include/mapnik/text/placement_finder_impl.hpp b/include/mapnik/text/placement_finder_impl.hpp
index 530d8ecb3..6d7146b03 100644
--- a/include/mapnik/text/placement_finder_impl.hpp
+++ b/include/mapnik/text/placement_finder_impl.hpp
@@ -22,7 +22,7 @@
 //mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/label_collision_detector.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/text/placement_finder.hpp>
 #include <mapnik/text/text_layout.hpp>
diff --git a/include/mapnik/text/symbolizer_helpers.hpp b/include/mapnik/text/symbolizer_helpers.hpp
index 6b7b7fe0d..96b61b854 100644
--- a/include/mapnik/text/symbolizer_helpers.hpp
+++ b/include/mapnik/text/symbolizer_helpers.hpp
@@ -29,7 +29,7 @@
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/text/placement_finder.hpp>
 #include <mapnik/proj_transform.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/vertex_converters.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp
index cf0012378..57de83388 100644
--- a/include/mapnik/vertex_converters.hpp
+++ b/include/mapnik/vertex_converters.hpp
@@ -27,7 +27,7 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/attribute.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/offset_converter.hpp>
 #include <mapnik/simplify.hpp>
 #include <mapnik/simplify_converter.hpp>
diff --git a/include/mapnik/ctrans.hpp b/include/mapnik/view_transform.hpp
similarity index 98%
rename from include/mapnik/ctrans.hpp
rename to include/mapnik/view_transform.hpp
index 5329de3d9..992b22726 100644
--- a/include/mapnik/ctrans.hpp
+++ b/include/mapnik/view_transform.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_CTRANS_HPP
-#define MAPNIK_CTRANS_HPP
+#ifndef MAPNIK_VIEW_TRANSFORM_HPP
+#define MAPNIK_VIEW_TRANSFORM_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -279,4 +279,4 @@ public:
 };
 }
 
-#endif // MAPNIK_CTRANS_HPP
+#endif // MAPNIK_VIEW_TRANSFORM_HPP
diff --git a/plugins/input/gdal/gdal_featureset.cpp b/plugins/input/gdal/gdal_featureset.cpp
index 198455175..8252ac589 100644
--- a/plugins/input/gdal/gdal_featureset.cpp
+++ b/plugins/input/gdal/gdal_featureset.cpp
@@ -26,7 +26,7 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/image_data.hpp>
 #include <mapnik/raster.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/util/variant.hpp>
diff --git a/plugins/input/pgraster/pgraster_featureset.cpp b/plugins/input/pgraster/pgraster_featureset.cpp
index c761ee11f..056d997cf 100644
--- a/plugins/input/pgraster/pgraster_featureset.cpp
+++ b/plugins/input/pgraster/pgraster_featureset.cpp
@@ -35,7 +35,7 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/raster.hpp>
 #include <mapnik/image_data.hpp>
 #include <mapnik/util/conversions.hpp>
diff --git a/plugins/input/pgraster/pgraster_wkb_reader.cpp b/plugins/input/pgraster/pgraster_wkb_reader.cpp
index e4c9de268..f67950a98 100644
--- a/plugins/input/pgraster/pgraster_wkb_reader.cpp
+++ b/plugins/input/pgraster/pgraster_wkb_reader.cpp
@@ -30,7 +30,7 @@
 #include <mapnik/datasource.hpp> // for datasource_exception
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/raster.hpp>
 #include <mapnik/image_data.hpp>
 #include <mapnik/util/conversions.hpp>
diff --git a/plugins/input/raster/raster_datasource.cpp b/plugins/input/raster/raster_datasource.cpp
index 969e22974..13d996e9e 100644
--- a/plugins/input/raster/raster_datasource.cpp
+++ b/plugins/input/raster/raster_datasource.cpp
@@ -25,7 +25,7 @@
 // mapnik
 #include <mapnik/util/fs.hpp>
 #include <mapnik/debug.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/image_reader.hpp>
 #include <mapnik/boolean.hpp>
diff --git a/plugins/input/raster/raster_featureset.cpp b/plugins/input/raster/raster_featureset.cpp
index 1843c6fae..ead8a53a4 100644
--- a/plugins/input/raster/raster_featureset.cpp
+++ b/plugins/input/raster/raster_featureset.cpp
@@ -24,7 +24,7 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/image_data.hpp>
 #include <mapnik/raster.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/image_reader.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/feature_factory.hpp>
diff --git a/src/map.cpp b/src/map.cpp
index 019f74fa1..a58bb51f6 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -32,7 +32,7 @@
 #include <mapnik/datasource.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/proj_transform.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/filter_featureset.hpp>
 #include <mapnik/hit_test_filter.hpp>
 #include <mapnik/scale_denominator.hpp>
diff --git a/src/text/placement_finder.cpp b/src/text/placement_finder.cpp
index 3bee0364d..0199679cf 100644
--- a/src/text/placement_finder.cpp
+++ b/src/text/placement_finder.cpp
@@ -22,7 +22,7 @@
 //mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/label_collision_detector.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/text/placement_finder_impl.hpp>
 #include <mapnik/text/text_layout.hpp>
diff --git a/src/warp.cpp b/src/warp.cpp
index 2b068fbb0..bb18bdabd 100644
--- a/src/warp.cpp
+++ b/src/warp.cpp
@@ -26,7 +26,7 @@
 #include <mapnik/image_data.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/box2d.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/raster.hpp>
 #include <mapnik/proj_transform.hpp>
 
diff --git a/tests/cpp_tests/geometry_converters_test.cpp b/tests/cpp_tests/geometry_converters_test.cpp
index c3b7e5a8c..618c67c6e 100644
--- a/tests/cpp_tests/geometry_converters_test.cpp
+++ b/tests/cpp_tests/geometry_converters_test.cpp
@@ -8,7 +8,7 @@
 #include <mapnik/feature_type_style.hpp>
 #include <mapnik/rule.hpp>
 #include <mapnik/debug.hpp>
-#include <mapnik/ctrans.hpp>
+#include <mapnik/view_transform.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/geometry.hpp>