various adaptions to prevent package uses conflicts