Changed '-' to '_' in directory names.