Refactoring 02 - t2flow writer using XPATH: port annotations and name changes