[MOD] Core: various refactorings and renamings of helper functions