Fixed namespace references after the move