EMPIREDB-362 Improved function naming
6 files changed