Revert "References metrics interface rename."

This is pretty broken. Backing out my changes for now.