Corrected nomeclature
Updated maps