Metrics attribute name changes and cleanup