remove TS
change field name