diff --git a/features/bicycle/names.feature b/features/bicycle/names.feature
index 5064bf5dd..d8a1ecf1e 100644
--- a/features/bicycle/names.feature
+++ b/features/bicycle/names.feature
@@ -17,7 +17,8 @@ Feature: Bike - Street names in instructions
 		When I route I should get
 		 | from | to | route           |
 		 | a    | c  | My Way,Your Way |
-		
+	
+	@unnamed
 	Scenario: Bike - Use way type to describe unnamed ways
 		Given the node map
 		 | a | b | c | d |
@@ -28,8 +29,8 @@ Feature: Bike - Street names in instructions
 		 | bcd   | track    |      |
 
 		When I route I should get
-		 | from | to | route          |
-		 | a    | d  | cycleway,track |
+		 | from | to | route                              |
+		 | a    | d  | {highway:cycleway},{highway:track} |
 
   	@area @names @todo
   	Scenario: Bike - name on streets overlapping an area
diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua
index e68935aab..c87baad33 100644
--- a/profiles/bicycle.lua
+++ b/profiles/bicycle.lua
@@ -165,7 +165,8 @@ function way_function (way)
 	elseif "" ~= name then
 		way.name = name
 	else
-		way.name = highway		-- if no name exists, use way type
+		way.name = "{highway:"..highway.."}"	-- if no name exists, use way type
+		                                        -- this encoding scheme is excepted to be a temporary solution
 	end
 		
 	-- speed