Corrected names and locations