Updated names (find/replace) and manually