CDI-342 unify example package names