update package and func names for loader