Ensured consistency of namings across the files changed (#1230)
changed energy_usage and energyusage to energy for consistency - device
type is therefore energy not energyusage
Modified some calculations to ensure correct output of values.
Signed-off-by: Mike McCaffery <mike@mccaffery.co.uk> (github: mccaffm)