Add name cleanup and parsed compare support