diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 66caa5610..1ba7727a4 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-29  Martin Thuresson  <martin@mtme.org>
+
+	* tic30.h (template): Rename type template to
+	insn_template. Updated code to use new name.
+	* tic54x.h (template): Rename type template to
+	insn_template.
+
 2009-08-20  Nick Hudson  <nick.hudson@gmx.co.uk>
 
 	* hppa.h (pa_opcodes): Add a pa10 bb without FLAG_STRICT.
diff --git a/include/opcode/tic30.h b/include/opcode/tic30.h
index 198e04e17..1302eddb1 100644
--- a/include/opcode/tic30.h
+++ b/include/opcode/tic30.h
@@ -241,9 +241,9 @@ typedef struct _template
 #define Imm_SInt  2
 #define Imm_UInt  3
 }
-template;
+insn_template;
 
-static const template tic30_optab[] = {
+static const insn_template tic30_optab[] = {
   { "absf"   ,2,0x00000000,AddressMode, { GAddr1, Rn, 0 }, Imm_Float },
   { "absi"   ,2,0x00800000,AddressMode, { GAddr2, AllReg, 0 }, Imm_SInt },
   { "addc"   ,2,0x01000000,AddressMode, { GAddr2, AllReg, 0 }, Imm_SInt },
@@ -604,7 +604,7 @@ static const template tic30_optab[] = {
   { ""       ,0,0x00000000,0,           { 0, 0, 0 }, 0 }
 };
 
-static const template *const tic30_optab_end =
+static const insn_template *const tic30_optab_end =
   tic30_optab + sizeof(tic30_optab)/sizeof(tic30_optab[0]);
 
 typedef struct {
diff --git a/include/opcode/tic54x.h b/include/opcode/tic54x.h
index a37ae33a8..31e2a2811 100644
--- a/include/opcode/tic54x.h
+++ b/include/opcode/tic54x.h
@@ -147,17 +147,17 @@ typedef struct _template
   const char* parname;
   enum optype paroperand_types[MAX_OPERANDS];
 
-} template;
+} insn_template;
 
-extern const template tic54x_unknown_opcode;
-extern const template tic54x_optab[];
-extern const template tic54x_paroptab[];
+extern const insn_template tic54x_unknown_opcode;
+extern const insn_template tic54x_optab[];
+extern const insn_template tic54x_paroptab[];
 extern const symbol mmregs[], regs[];
 extern const symbol condition_codes[], cc2_codes[], status_bits[];
 extern const symbol cc3_codes[];
 extern const char *misc_symbols[];
 struct disassemble_info;
-extern const template* tic54x_get_insn (struct disassemble_info *, 
+extern const insn_template* tic54x_get_insn (struct disassemble_info *, 
                                         bfd_vma, unsigned short, int *);
 
 #endif /* _opcode_tic54x_h_ */