Cleaned up function names and started using prefix-in for table modules.
Fixed name shadowing bugs.