Renamed Nivo into Bouw
and Onderwerp into Vak