Refactoring: changed classes and vars name
Cleaned up the code.

Signed-off-by: DeK