few more naming changes