Reformatted package references to more compact version