More general fixes to file structure naming.