Fixed naming changes.