WTP 3.5.1 integration

Refactor for JSDT synonims