Update package name in a few more places