Rename, and fix GLI changes.