Rename EntityObserver to Observer