Change option names to match v2 on Cluster Node