fix renaming and replace usage of deprecated macros
Merge branch 'dev' of git@github.com:celements/celements-web.git into dev