HUE-1190 [core] Consistent renaming