Fixed typo
Added logic to server / class naming fixes
Refactor