Work on case split variable naming