Old classname fix