Remove prepended type from fixed properties and add mapping for 006