Update to new factories for effects

Test: make

Change-Id: Ib342878524b51d0eacf6c60ece3c7da8bf27d2c0
12 files changed