removed warnings and renamed billing product table