Core: More Function Renaming.