Refactored remaining bad classes names