Revert "Rename factories as creators"

This reverts commit dc31cf956cba474e61ad9a4be06455bc9a49128e.