Updated names and directories