Update to have a single contract per name