Renaming for clarity
Merge pull request #18 from bobgru/renaming

Renaming for clarity