fixed tmp class naming omissions