Fix some core names.