Update namespace use due to refactoring.