Fix hardcoded table names
Merge pull request #47 from camcima/master

Fix hardcoded table names