cleanup of the outdated class names