diff --git a/Resources/views/Ticket/index.html.twig b/Resources/views/Ticket/index.html.twig
index 258d2197..9d7ccdf6 100644
--- a/Resources/views/Ticket/index.html.twig
+++ b/Resources/views/Ticket/index.html.twig
@@ -1,5 +1,5 @@
 {% extends '@HackzillaTicket/layout.html.twig' %}
-{% import 'hackzilla_ticket.templates.macros' as macros %}
+{% import hackzilla_ticket.templates.macros as macros %}
 
 {% block hackzilla_ticket_content -%}
     <h1>{{ 'HEADING_TICKET_LIST'|trans }}</h1>
diff --git a/Resources/views/Ticket/new.html.twig b/Resources/views/Ticket/new.html.twig
index 5420faf9..757595b5 100644
--- a/Resources/views/Ticket/new.html.twig
+++ b/Resources/views/Ticket/new.html.twig
@@ -14,9 +14,9 @@
             </div>
 
             {% if form.messages|length == 0 %}
-                {% include 'hackzilla_ticket.templates.prototype' with {'form': form.messages.vars.prototype} %}
+                {% include hackzilla_ticket.templates.prototype with {'form': form.messages.vars.prototype} %}
             {% else %}
-                {% include 'hackzilla_ticket.templates.prototype' with {'form': form.messages.__name__} %}
+                {% include hackzilla_ticket.templates.prototype with {'form': form.messages.__name__} %}
             {% endif %}
 
             {{ form_rest(form) }}
diff --git a/Resources/views/Ticket/show.html.twig b/Resources/views/Ticket/show.html.twig
index a41c5763..aa401ee5 100644
--- a/Resources/views/Ticket/show.html.twig
+++ b/Resources/views/Ticket/show.html.twig
@@ -1,5 +1,5 @@
 {% extends '@HackzillaTicket/layout.html.twig' %}
-{% import '@HackzillaTicket/Macros/macros.html.twig' as macros %}
+{% import hackzilla_ticket.templates.macros as macros %}
 
 {% block hackzilla_ticket_content -%}
 
@@ -51,7 +51,7 @@
                 <div class="panel-body">
                     {{ message.message|nl2br }}
                     {% if(hasTicketFeature('attachment')) %}
-                        {{ include('@HackzillaTicket/Ticket/show_attachment.html.twig', {'message': message}) }}
+                        {% include hackzilla_ticket.templates.show_attachment with {'message': message} %}
                     {% endif %}
                 </div>
             </div>
@@ -66,7 +66,7 @@
     {% if form is defined %}
         <div class="well well-sm">
             {{ form_start(form, {'method': 'POST', 'action': path('hackzilla_ticket_reply', {'ticketId': ticket.id})}) }}
-            {% include 'hackzilla_ticket.templates.prototype' with {'form': form} %}
+            {% include hackzilla_ticket.templates.prototype with {'form': form} %}
 
             {{ form_rest(form) }}
 
diff --git a/Resources/views/Ticket/show_attachment.html.twig b/Resources/views/Ticket/show_attachment.html.twig
index f433cf8a..d5eb2e34 100644
--- a/Resources/views/Ticket/show_attachment.html.twig
+++ b/Resources/views/Ticket/show_attachment.html.twig
@@ -1,4 +1,4 @@
-{% import 'hackzilla_ticket.templates.macros' as macros %}
+{% import hackzilla_ticket.templates.macros as macros %}
 {% if message.attachmentName %}
 <br>
 <div class="ticket_attachment">