internal naming changes