use different generators for suite and media_suite

the way it was done before was super confusing and backwards