Merge "Rename of session APIs"