Rename STBattery to Battery