Merge "Rename standby methods"