Make table name and other terminology consistent