Renamed assembly names and default namespaces.
Adjusted namespaces.
Merge branch 'adjust-namespaces'