After the Reconquista, the territories of the two historical sees of Basti and Ancient Acci were united on 21 May 1492 as the modern Diocese of Guadix, a suffragan of the Archdiocese of Granada. A collegiate church, the Colegiata de Nuestra Señora Santa María de la Encarnación, Baza, was established at Basti/Baza. This was reluctant to accept rule from Guadix. As a compromise, the collegiate church was given authority, under the bishop, over twelve parishes, and the bishopric adopted a second name, diocese of Guadix-Baza, indicating a union of two dioceses under a single bishop. This continued until 1851, when the collegiate church became a simple parish church and the diocese resumed the name of Diocese of Guadix.