Updated tables

fixed calls and references to tables after the change to structure