Changed table name and primary key definitions because they are being
deprecated