removed scopedSetter, renamed identifiers