[REFACT] Changes in commands (renaming etc)