[NUCRDBMS-806] Further rename