Keep old ES namespace for now