Remove old package names from X-incorporation