Rename internal methods