Reorganise now instances are named and generated, so that we only make them once if possible