removed old names that were accidentally still being used
Merge branch 'master' of github.com:jacobkingery/CA14MP3