Adjusted class naming convention

Adjusted class naming convention