Name Fixes

Will fix #22. It isn't done yet but I hope to finish fairly soon :smile: