refactored all classes referencing collection, device, software and material type.