Merge "Rename methods that take caller identity"