Rename, strip out statsd