[TASK] Class name of the link is variable now, also cleaned up the term wrapper