Simplified the package names