Revert "Rename; reformat"

This reverts commit fcd65a370cdd57b36bb632bb08ff177941350cf7.
Proper namespace