Improve Glade/ASF terminology