Fix vars name