move name references to Analysis