A bunch of internal naming changes

For consistent naming between functions.