Changes to accomodate managed package namespace