Changed variables names in modules