Re-jig command names