Refactored table name