[Imp] Improve help and naming conventions.