Simplified table name code for now