swap some classes for consistency purpose