apache: Various updates

Your updates for ancora, and a little renaming.