rename removes "Type" in classnames since moving to composite pattern
not strategy