Rename a couple internal methods for clarity