Classes name refactor