fix use of deprecated func
clarify meter namings