Updated method names to better align with intention of encapsulating structure.