Fix package namespace issues