`gafferd_cli` -> `cli` & `gaffer_lookupd` -> `lookupd`

esthetic changes. Current wording looked ugly to my eyes.