Revert "Config: change base_entity_manager to entity_manager"

This reverts commit f81cf33ebac82ca5a996b0de700a9d1ec1076baf.