Some quick namespace name changes