Fix assembly type mapping to better handle namespaces and nested types