Remove needless namingFactory usage