And update package name