Updated internal bean name references.