update file/classnames to address namespace issue