Revert PG metric name change

@remh I changed my mind on the metric names. Mostly because we
already have a bunch of rates that don't have a per_sec suffix.