Fix namespaces
Auto-ing code