rename token contstructors
alter syntax modules