Fix table aliases.
Removed tenor.
Integrate contract and book concepts.