rename ClassName and SetClassName to Class and SetClass
remove stale TODOs