Namespace and License attribute fixes