I2C-0009 - mhuckaby : renamed common object factory and associated enum