munge method/field names, fixed #TANAL-18