CE-422 improving name convention