Classes names refactor