ongoing rearrangement: consistency in names and signatures of state functions