more fixes
changed name due to double underscore mangling