Fix variables names (again)