Update class/etc. names