Eliminated usage of underscore in filenames