shouldn't the package name be changed here also?