fix variables names