Update SurplusMeter for new naming conventions
Merge pull request #1609 from Cottser/surplusmeter

Update SurplusMeter for new naming conventions