More namespace changes in backend code