Rename keywords into tags