NAS-2384 Implemented consistent module-name -> module-name-core naming.