Add Composite Naming option