More package namespace cleanup