Ack (finally) name change in subpackages, tweak package build