fixed index names and constraints