Re-namespacing some things for clarity (I hope!)