Fix assembly naming and namespaces