FactoryWrapper is a misnomer now

Change-Id: I59d77b4712e273318409a326c835861dc467596c