Hopefully dealt with bug involving incorrect naming of files and directories