Move command to proper position.
Rename commands.