Renaming elements, adding models