Substitute the package name as well.