Rename make-heartbeat -> make-control