Update factories to work with updated properties

This is my mistake, not updating factories when changing the property names.