Unreachable code warning fixed
Inplace rename for classes
Inplace renaming in all possible places