Renamed some stuff according to the conventions and assigned the correct AO map