Converted some unused class names in the attic.