Update partial names

Delete and rename files, reformat models