Energy Productivity -> Energy Efficiency

Closes #1827