Clean up variable naming in patient spec