[B.A.T.M.A.N.] Remaining cleanup/prefixing patches