givi - Simplify command names