fix namespace changes for EG