get rid of Type in names of vars