Rename container matching methods to better align with functionality