Made class names less ambiguous