Fix declaration matching after clang-tidy changes

After clang-tidy fix on EntityUtils.h (changes to function declarations), corresponding functions definitions are not adapted properly and therefore it breaks the build. Necessary changes are made to fix this error