Replace hyphen with underscore in system filesystem timeseries name.
Allow current cost units to be named independently.