remove some left-over about attribut type handling
correct '__' to '_' in a var name