Rename to aiswatcher
cleanup