New package name and other small changes.