Refactor class names; add change notification