Change Tables name
Fix bugs in ranking part