More renaming
Merge pull request #5 from jrossi/master

MOre Renaming