done issue #55; rename some keynodes