monitor: Refactor/rename a few minor things

Signed-off-by: Ondrej Kupka <ondra.cap@gmail.com>