CGIV-1535: module is reserved word so need to change it