Renames headers, demos in separate comp. units