Fix inverted roles in descriptor generation