diff --git a/include/doorkeeper/helpers/tilecoordinates.hpp b/include/doorkeeper/components/pixelconv.hpp
similarity index 90%
rename from include/doorkeeper/helpers/tilecoordinates.hpp
rename to include/doorkeeper/components/pixelconv.hpp
index 3e0d605..9088e36 100644
--- a/include/doorkeeper/helpers/tilecoordinates.hpp
+++ b/include/doorkeeper/components/pixelconv.hpp
@@ -3,7 +3,7 @@
 
 #include "doorkeeper/components/tileiterator.hpp"
 
-namespace dkh {
+namespace dk {
 	template <typename T, typename T1>
 	dk::Vector<2> get_diamond_coordinates ( const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize );
 
@@ -15,8 +15,8 @@ namespace dkh {
 
 	template <typename T, typename T1>
 	dk::Vector<2> get_hex_coordinates ( const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize );
-} //namespace dkh
+} //namespace dk
 
-#include "doorkeeper/implem/tilecoordinates.inl"
+#include "doorkeeper/implem/pixelconv.inl"
 
 #endif
diff --git a/include/doorkeeper/implem/tilecoordinates.inl b/include/doorkeeper/implem/pixelconv.inl
similarity index 96%
rename from include/doorkeeper/implem/tilecoordinates.inl
rename to include/doorkeeper/implem/pixelconv.inl
index 0dca325..790ddc5 100644
--- a/include/doorkeeper/implem/tilecoordinates.inl
+++ b/include/doorkeeper/implem/pixelconv.inl
@@ -1,4 +1,4 @@
-namespace dkh {
+namespace dk {
 	template <typename T, typename T1>
 	inline
 	dk::Vector<2> get_diamond_coordinates (const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize) {
@@ -27,4 +27,4 @@ namespace dkh {
 	//inline
 	//dk::Vector<dk::CoordinateScalarType, 2> get_hex_coordinates (const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<dk::CoordinateScalarType, 2>& parSize) {
 	//}
-} //namespace dkh
+} //namespace dk
diff --git a/test/main.cpp b/test/main.cpp
index 7583ef6..6a7f86a 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -3,7 +3,7 @@
 #include "platform.h"
 #include "platformstrings.h"
 #include "doorkeeper/helpers/asciimapsource.hpp"
-#include "doorkeeper/helpers/tilecoordinates.hpp"
+#include "doorkeeper/components/pixelconv.hpp"
 #include "doorkeeper/helpers/maploader.hpp"
 #include <iostream>
 #include <fstream>
@@ -218,7 +218,7 @@ namespace {
 
 		for (auto itTile = parView.begin(parLayer), itTileEND = parView.end(parLayer); itTile != itTileEND; ++itTile) {
 			SDL_Rect rect_dst;
-			const auto pixel_pos = dkh::get_diamond_coordinates(itTile, tilesize);
+			const auto pixel_pos = dk::get_diamond_coordinates(itTile, tilesize);
 			rect_src.y = offsets[*itTile];
 			rect_src.h = original_size.y() - offsets[*itTile];
 
diff --git a/test/unit/asciimapsource.cpp b/test/unit/asciimapsource.cpp
index 0189ed6..5015d4c 100644
--- a/test/unit/asciimapsource.cpp
+++ b/test/unit/asciimapsource.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include "doorkeeper/helpers/asciimapsource.hpp"
 #include "doorkeeper/doorkeeper.hpp"
-#include "doorkeeper/helpers/tilecoordinates.hpp"
+#include "doorkeeper/components/pixelconv.hpp"
 #include "asciimapsource.hpp"
 #include <sstream>
 #include <memory>
@@ -55,8 +55,10 @@ TEST_F(asciimapsource, coordinates) {
 
 	full_view.setFrom(coords2(0));
 	for (auto itTile = full_view.begin(*layer), itTileEND = full_view.end(*layer); itTile != itTileEND; ++itTile) {
-		const coords2 expected_coords(tile_size * itTile.position());
-		const auto returned_coords(dkh::get_square_coordinates<2>(itTile, tile_size));
-		EXPECT_EQ(expected_coords, returned_coords);
+		{
+			const coords2 expected_coords(tile_size * itTile.position());
+			const auto returned_coords(dk::get_square_coordinates<2>(itTile, tile_size));
+			EXPECT_EQ(expected_coords, returned_coords);
+		}
 	}
 }