add descriptive names and google/osm icons