clean up mockups, especially 2013, fix names