MT#5879 Rename invoice template tables to s suffices.
MT#5879 Rename invoice template tables to s suffices.