Internal naming changes