* replace usage of deprecated orderBy instruction remove unnecesarry extra order instruction update e2e test * rename symbols
* replace usage of deprecated orderBy instruction remove unnecesarry extra order instruction update e2e test * rename symbols