Core: Some function renaming.