Related thread: Istanbul was Constantinople, If you've a date in Constantinople she'll be waiting in Istanbul
Free text is not a good solution, in my opinion, because it diminishes the ability to uniquely identify places. I think using the modern entity is the least bad option we have today (and the one that most editors use).