Mostly renames or removing already defined types Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3378>