Changing package names to avoid conflict