Is it worth pulling `package.name` out here, too?