ZoneType => ZoneLocation. Made things that previously only had the enum now have an actual Zone (not sure about that part).