Issue #21: Unify naming politics for binaries and plugins