TWRP: moar cleanup, adjust device props to be closer to stock names