Names and file reorganization