Fix zones with database/naming. Moving works now.