Rename add-comment command to be consistent
Rename label-add/remove command to be consistent
Rename component-add/remove cmd to be consistent
Rename watch-add/remove cmd to be consistent
Reorder code for better readability