shotop: better naming of files and tests