Fix #132
Comment From: markpollack
Hi. As part of a large renaming/refactoring effort I did this work, sorry about that, the contribution is appreciated. I'm not used to community members being so active to send PRs! Again, thanks and happy holidays. Any feedback on the changes made is appreciated.