Replace zone references with Zones module