Updated maps so names work even if they have apostrophes