Change the FK and Index name generation