Fixes to namespaces and dll names.