Rename vars to match coding style
Make the table names byte arrays