Cleanup of action

extract -> defineExtractFlow
augment -> defineAugmentFlow