Minor changes -- Modules named according to GTK/GTK3 conventions