refactor class names + fix build with correct DESCRIPTION/collate order