fixing duplicate name errors 
(code generated from this version might be incompatible with older
ones!)