Added name to datamodel classes, id derived from name.
Fixed problem with depository.getName() vs getId().