Merge naming guidance from organizing to preparing