Adjust namespace

Some other adjustments that should've probably been made when d.o was made the new home for this module.

Closes #3604084