Merge pull request #1036 from rustyswayne/Refactor/M-502

Renames model builder extensions to 'factory' as it is more representative of their purpose.