diff --git a/contracts/templates/ERC20Template.sol b/contracts/templates/DataTokenTemplate.sol
similarity index 92%
rename from contracts/templates/ERC20Template.sol
rename to contracts/templates/DataTokenTemplate.sol
index 385cd5c2d..3322e6a84 100644
--- a/contracts/templates/ERC20Template.sol
+++ b/contracts/templates/DataTokenTemplate.sol
@@ -7,12 +7,12 @@ import '../fee/FeeManager.sol';
 import './token/ERC20Pausable.sol';
 import '../interfaces/IERC20Template.sol';
 /**
-* @title ERC20Template
+* @title DataTokenTemplate
 *  
-* @dev ERC20Template is a DataToken ERC20 compliant template
+* @dev DataTokenTemplate is a DataToken ERC20 compliant template
 *      Used by the factory contract as a bytecode reference to deploy new DataTokens.
 */
-contract ERC20Template is IERC20Template, ERC20Pausable {
+contract DataTokenTemplate is IERC20Template, ERC20Pausable {
     using SafeMath for uint256;
     
     bool    private initialized = false;
@@ -28,7 +28,7 @@ contract ERC20Template is IERC20Template, ERC20Pausable {
     modifier onlyNotInitialized() {
         require(
             !initialized,
-            'ERC20Template: token instance already initialized'
+            'DataTokenTemplate: token instance already initialized'
         );
         _;
     }
@@ -36,7 +36,7 @@ contract ERC20Template is IERC20Template, ERC20Pausable {
     modifier onlyMinter() {
         require(
             msg.sender == _minter,
-            'ERC20Template: invalid minter' 
+            'DataTokenTemplate: invalid minter' 
         );
         _;
     }
@@ -123,22 +123,22 @@ contract ERC20Template is IERC20Template, ERC20Pausable {
     {
         require(
             minter != address(0), 
-            'ERC20Template: Invalid minter,  zero address'
+            'DataTokenTemplate: Invalid minter,  zero address'
         );
         
         require(
             feeManager != address(0), 
-            'ERC20Template: Invalid feeManager, zero address'
+            'DataTokenTemplate: Invalid feeManager, zero address'
         );
 
         require(
             _minter == address(0), 
-            'ERC20Template: Invalid minter, access denied'
+            'DataTokenTemplate: Invalid minter, access denied'
         );
 
         require(
             cap > 0,
-            'ERC20Template: Invalid cap value'
+            'DataTokenTemplate: Invalid cap value'
         );
         
         _decimals = 0;
@@ -172,11 +172,11 @@ contract ERC20Template is IERC20Template, ERC20Pausable {
     {
         require(
             totalSupply().add(value) <= _cap, 
-            'ERC20Template: cap exceeded'
+            'DataTokenTemplate: cap exceeded'
         );
         require(
             msg.value >= serviceFeeManager.calculateFee(value, _cap), 
-            'ERC20Template: invalid data token minting fee'
+            'DataTokenTemplate: invalid data token minting fee'
         );
         _mint(account, value);
         address(serviceFeeManager).transfer(msg.value);
diff --git a/test/unit/ERC20Template.Test.js b/test/unit/DataTokenTemplate.Test.js
similarity index 94%
rename from test/unit/ERC20Template.Test.js
rename to test/unit/DataTokenTemplate.Test.js
index d73c740a1..efaa09b23 100644
--- a/test/unit/ERC20Template.Test.js
+++ b/test/unit/DataTokenTemplate.Test.js
@@ -1,14 +1,14 @@
 /* eslint-env mocha */
 /* global artifacts, contract, it, beforeEach, web3, assert */
-const Template = artifacts.require('ERC20Template')
+const Template = artifacts.require('DataTokenTemplate')
 const FeeManager = artifacts.require('FeeManager')
 const Factory = artifacts.require('Factory')
-const Token = artifacts.require('ERC20Template')
+const Token = artifacts.require('DataTokenTemplate')
 const testUtils = require('../helpers/utils')
 const truffleAssert = require('truffle-assertions')
 const BigNumber = require('bn.js')
 
-contract('ERC20Template', async (accounts) => {
+contract('DataTokenTemplate', async (accounts) => {
     let cap,
         name,
         symbol,
@@ -54,7 +54,7 @@ contract('ERC20Template', async (accounts) => {
     it('should fail to re-initialize the contracts', async () => {
         truffleAssert.fails(token.initialize('NewName', 'NN', reciever, cap, blob, feeManager.address),
             truffleAssert.ErrorType.REVERT,
-            'ERC20Template: token instance already initialized')
+            'DataTokenTemplate: token instance already initialized')
     })
 
     it('should check that the token is not paused', async () => {
@@ -88,7 +88,7 @@ contract('ERC20Template', async (accounts) => {
     it('should not mint the tokens due to zero message value', async () => {
         truffleAssert.fails(token.mint(reciever, 10, { from: minter }),
             truffleAssert.ErrorType.REVERT,
-            'ERC20Template: invalid data token minting fee')
+            'DataTokenTemplate: invalid data token minting fee')
     })
 
     it('should not mint the tokens due to the cap limit', async () => {
@@ -98,7 +98,7 @@ contract('ERC20Template', async (accounts) => {
 
         truffleAssert.fails(token.mint(reciever, tokenCap, { value: ethValue, from: minter }),
             truffleAssert.ErrorType.REVERT,
-            'ERC20Template: cap exceeded')
+            'DataTokenTemplate: cap exceeded')
     })
 
     it('should not mint the tokens because of the paused contract', async () => {
diff --git a/test/unit/Factory.Test.js b/test/unit/Factory.Test.js
index bd9e3d4f8..f4cbb880f 100644
--- a/test/unit/Factory.Test.js
+++ b/test/unit/Factory.Test.js
@@ -2,7 +2,7 @@
 /* global artifacts, contract, it, beforeEach */
 
 const Factory = artifacts.require('Factory')
-const Template = artifacts.require('ERC20Template')
+const Template = artifacts.require('DataTokenTemplate')
 const FeeManager = artifacts.require('FeeManager')
 const truffleAssert = require('truffle-assertions')
 
@@ -51,14 +51,14 @@ contract('Factory test', async accounts => {
     it('should fail on zero minter address initialization', async () => {
         truffleAssert.fails(Template.new('Zero address minter contract', 'ZERO', zeroAddress, cap, blob, feeManager.address),
             truffleAssert.ErrorType.REVERT,
-            'ERC20Template: Invalid minter,  zero address'
+            'DataTokenTemplate: Invalid minter,  zero address'
         )
     })
 
     it('should fail on zero feeManager address initialization', async () => {
         truffleAssert.fails(Template.new('Zero address minter contract', 'ZERO', minter, cap, blob, zeroAddress),
             truffleAssert.ErrorType.REVERT,
-            'ERC20Template: Invalid minter,  zero address'
+            'DataTokenTemplate: Invalid minter,  zero address'
         )
     })
 })