Refactoring to support simpler documentation
Merge remote-tracking branch 'origin/master'
Additional refactoring of names
Merge pull request #1 from termMed/master

General renaming classes and parameters to support better documentation