[Ada] Fix references to old variables that have been refactored