fundamental_dimension->base_dimension composite_dimension->derived_dimension various changes for compatibility with SI nomenclature