add support for refactoring of data-field names as well as reverse completion from template to class