Class name cleanup