FEND-563: refactoring the naming convention