Add namespaces

Why did this change?