Fix the creation of object to follow the ES6 spec.
Fix the creation of object to follow the ES6 spec.

ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery