OK, I'm going to go ahead and rename ib_mad.c -> mad.c, ib_agent.c -> agent.c etc. (This also makes it possible to build a module named ib_mad.o, which I think makes more sense than ib_al.o, from multiple sources). I can continue to merge by hand but it might make sense to make the same change on Hal's branch. - R.