Update and rename Metrics to metrics