reverted complicated ::ClassNames now that we fixed the real issue