Agfa and Gevaert (spelling!) merged in 1964. This was economically as politically of importance, but needed two new sub-companies, who practically merged.
At this stage Gevaert transferred their assets practically completely into Gevaert-Agfa N.V., whereas Bayer only transferred their small sub-Division Agfa into Agfa-Gevaert AG.
At the silvercrisis Gevaert was paid off by Bayer and changed their field of business.
Later Bayer left the photochemical field too by selling Agfa-Gevaert.
Agfa (Agfa-Gevaert) became a flemish company on public shares.
In 2004 they sold their consumer branch AgfaPhoto, which short after demised under the new owner.
You are right so far as most of the former Gevaert plants still belong to Agfa and the Agfa headqarters are located at the Gevaert main plant. However the traces of Gevaert are few, the name Agfa is prominent.