shotop: additional naming updates