Change messages variables names
Partially refactor commands