fix naming changes