Switch to commander, add default node name support