refactored some factory names to factory finders since they rely on finding factories to create the objects in question