Adding more naming changes