Use GLG class prefix more consistently