Fix builders to allow for tablePrefix

This change allows the tablePrefix to be added properly. Sorry I don't have tests!