AVALANCHE: Finish renaming/refactoring in Gyro.
AVALANCHE: Fix bug due to unsaved changes.