JLANGX-11 refactor aimed to have a consistent naming convention