Name template reorganization