more name changes
Merge branch 'master' of https://github.com/stuycs-ml7-projects/macguffin