Expanded the name file structure.