unify package names for demo