make all structure names uniform ... in progress