Bringing constraint names up to date with naming convention