Refactor CLI UI to generally resource names, fixes #14