Fix package instance names