Our terminology is confusing. I propose the following changes: CompartmentType -> Compartment Compartment -> Deme