Change class name to avoid duplication