Removed hard coded table names.
Merge pull request #29 from jirafe/remove-hardcoded-tablenames

Removed hard coded table names.