Refactor

- rename message to command
- adjust command types