Fix previous commit, 'ot.' prefix must be dropped from factoryName, not factory

Rewrite these lines to make them more simple and readable.