Update comment-us with new classes

As part of the work @phamann recently completed to correctly namespace the containers on frontend.