Rename set/getState and few changes in AcR and models