I did some interpolation, which I learnt from watching how it's done in a Swedish city called Linkoping. Now I'm not sure I did it exactly as they've done it, but at least I'm not adding the street name to each node of the interpolation way.

I also added the bus stop Navarinou beside the road.