Updated the names to be less ambiguous