Add back Cm Battery and change the name of circlemod battery