Fix references to package namespace