fix naming conflict with z1,z10