update generator to use use prefix for group