CHange NERTree and Tabgar remaps