Fix Figaro variable names