diff --git a/analyzers/Shodan/shodan_analyzer.py b/analyzers/Shodan/shodan_analyzer.py
index af74b8481..efcb8aa33 100755
--- a/analyzers/Shodan/shodan_analyzer.py
+++ b/analyzers/Shodan/shodan_analyzer.py
@@ -57,17 +57,17 @@ def summary(self, raw):
             if 'asn' in raw['host']:
                 taxonomies.append(self.build_taxonomy(level, namespace, 'ASN', raw['host']['asn']))
         elif self.service == 'info_domain':
-            if 'ips' in raw['infos_domain']:
-                value = "{}".format(len(raw['infos_domain']['ips']))
+            if 'ips' in raw['info_domain']:
+                value = "{}".format(len(raw['info_domain']['ips']))
                 taxonomies.append(self.build_taxonomy(level, namespace, 'IPs', value))
-            if 'all_domains' in raw['infos_domain']:
-                value = "{}".format(len(raw['infos_domain']['all_domains']))
+            if 'all_domains' in raw['info_domain']:
+                value = "{}".format(len(raw['info_domain']['all_domains']))
                 taxonomies.append(self.build_taxonomy(level, namespace, 'Domains', value))
-            if 'asn' in raw['infos_domain']:
-                value = "{}".format(len(raw['infos_domain']['asn']))
+            if 'asn' in raw['info_domain']:
+                value = "{}".format(len(raw['info_domain']['asn']))
                 taxonomies.append(self.build_taxonomy(level, namespace, 'ASNs', value))
-            if 'isp' in raw['infos_domain']:
-                value = "{}".format(len(raw['infos_domain']['isp']))
+            if 'isp' in raw['info_domain']:
+                value = "{}".format(len(raw['info_domain']['isp']))
                 taxonomies.append(self.build_taxonomy(level, namespace, 'ISPs', value))
         elif self.service == 'dns_resolve':
             value = "{}".format(len(raw['records']))
diff --git a/thehive-templates/Shodan_InfoDomain_1_0/long.html b/thehive-templates/Shodan_InfoDomain_1_0/long.html
index 95aabff92..1877c5fa1 100644
--- a/thehive-templates/Shodan_InfoDomain_1_0/long.html
+++ b/thehive-templates/Shodan_InfoDomain_1_0/long.html
@@ -6,54 +6,54 @@
         <dl class="dl-horizontal">
             <dt>ASN</dt>
             <dd>
-                {{content.infos_domain.asn.join(', ') || '-'}}
+                {{content.info_domain.asn.join(', ') || '-'}}
             </dd>
         </dl>
         <dl class="dl-horizontal">
             <dt>ISP</dt>
             <dd>
-                <span ng-if="content.infos_domain.isp.length === 0">-</span>
+                <span ng-if="content.info_domain.isp.length === 0">-</span>
                 <ul class="list-unstyled">
-                    <li data-ng-repeat=" i in content.infos_domain.isp">{{i}}</li>
+                    <li data-ng-repeat=" i in content.info_domain.isp">{{i}}</li>
                 </ul>
             </dd>
         </dl>
         <dl class="dl-horizontal">
             <dt>Domains</dt>
             <dd>
-                <span ng-if="content.infos_domain.all_domains.length === 0">-</span>
+                <span ng-if="content.info_domain.all_domains.length === 0">-</span>
                 <ul class="list-unstyled">
-                    <li data-ng-repeat="i in content.infos_domain.all_domains">{{i | fang}}</li>
+                    <li data-ng-repeat="i in content.info_domain.all_domains">{{i | fang}}</li>
                 </ul>
             </dd>
         </dl>
         <dl class="dl-horizontal">
             <dt>Ports</dt>
             <dd>
-                {{content.infos_domain.ports.join(', ') || '-'}}
+                {{content.info_domain.ports.join(', ') || '-'}}
             </dd>
         </dl>
         <dl class="dl-horizontal">
             <dt>Orgs</dt>
             <dd>
-                <span ng-if="content.infos_domain.orgs.length === 0">-</span>
+                <span ng-if="content.info_domain.orgs.length === 0">-</span>
                 <ul class="list-unstyled">
-                    <li data-ng-repeat="i in content.infos_domain.orgs">{{i}}</li>
+                    <li data-ng-repeat="i in content.info_domain.orgs">{{i}}</li>
                 </ul>
             </dd>
         </dl>
         <dl class="dl-horizontal">
             <dt>Transports</dt>
             <dd>
-                {{content.infos_domain.transports.join(', ') || '-'}}
+                {{content.info_domain.transports.join(', ') || '-'}}
             </dd>
         </dl>
         <dl class="dl-horizontal">
             <dt>IPs</dt>
             <dd>
-                <span ng-if="content.infos_domain.ips.length === 0">-</span>
+                <span ng-if="content.info_domain.ips.length === 0">-</span>
                 <ul class="list-unstyled">
-                    <li data-ng-repeat="i in content.infos_domain.ips">{{i | fang}}</li>
+                    <li data-ng-repeat="i in content.info_domain.ips">{{i | fang}}</li>
                 </ul>
             </dd>
         </dl>