Rename function for PR 152