Regarding the AI Names, in my local files each civ actually has at least 8 AINames (only the Iberians for some reason have a double entry of Viriato, so there'd be a single one missing for the Iberians).
I suggest to remove the system of counting names that are chosen multiple times with Roman numbers. Especially if it's this simple to change.
Currently, in a 4v4 of AIs with everyone playing Persians, on average 2 to 3 players will get a 'problematic' name because many of the their names include a Roman numeral themselves and an additional one is added if a name is picked multiple times.