ISV/JFA: Change x attribute into __x__ to distinguish it from class attribute (close #162)