Rename syntax matches