Code naming changes