Rename of pre and elems to generic nodes