update definition and fix bad suffix