Refactor Classes name for UNIX support