observer-related big rename changes
12 files changed