Cleanup from review

Rename module and command