Update variable name to commonlib name.