moved some xmlids to reflect new definitions of models