Restored original package names to comply with GPL