moved rated units in rate group and transformed it in duration
some name refactoring