Cleanup av.c, rename classes, no new development