updated classnames
updated classnames to avoid namespace conflicts