naming changes for site doctrine refactor