Fix forgotten class naming changes