added containment and naming

Signed-off-by: dvorkinista <villain@noironetworks.com>