Key conflict fixes for CLI. Made them all caps to avoid possible collisions.