refactor metrics with package rename