Refactored Class Names to 3 digits