[MOD] Updates to refactorings and renamings in the core project