More appropriate naming (also, preventing ambiguities with --smart)