Rename expr variables into expression for consistency