General format and naming cleanup
Add Nokia Here map with track