`gaffer.cli` -> `gaffer.gaffer_cli`