Chest => Container
Trapped*
Merge pull request #1 from NathanTheBook/master

Use proper names