General renaming classes and parameters to support better documentation

General renaming classes and parameters to support better documentation