Fix variables names