renamed a lot of billing arrangement stuff