Fixed package names in wrappers.