Fix Tablenames