Replace hyphen in filename with underscore & rename ns