Changed how module names are assigned to cherry module holders