Replace old names with ClusterHQ in most places - fixes 369

Fixes #369.