Better namespaces and types.