Fix static fields import & method name with template params
Merge static field initialization and field
Fix msethod names which had template arguments like <T> in the name.
Improve namespace translation to insert in model based on context