Rename stuff to support namespaced automagic