Fix for duplicate class name being used