diff --git a/contracts/GovernorBravoDelegate.sol b/contracts/GovernorBravoDelegate.sol
index 29af7a5..e1b7fdb 100644
--- a/contracts/GovernorBravoDelegate.sol
+++ b/contracts/GovernorBravoDelegate.sol
@@ -9,7 +9,7 @@ import {
 } from "./GovernorBravoInterfaces.sol";
 import { SafeMath } from "./SafeMath.sol";
 
-contract GovernorBravoDelegate is GovernorBravoDelegateStorageV1, GovernorBravoEvents {
+contract InstaGovernorBravoDelegate is GovernorBravoDelegateStorageV1, GovernorBravoEvents {
     /// @notice The name of this contract
     string public constant name = "DSL Governor Bravo";
 
diff --git a/contracts/GovernorBravoDelegator.sol b/contracts/GovernorBravoDelegator.sol
index f6aa05f..fa2f89e 100644
--- a/contracts/GovernorBravoDelegator.sol
+++ b/contracts/GovernorBravoDelegator.sol
@@ -3,7 +3,7 @@ pragma experimental ABIEncoderV2;
 
 import { GovernorBravoDelegatorStorage, GovernorBravoEvents } from "./GovernorBravoInterfaces.sol";
 
-contract GovernorBravoDelegator is GovernorBravoDelegatorStorage, GovernorBravoEvents {
+contract InstaGovernorBravoDelegator is GovernorBravoDelegatorStorage, GovernorBravoEvents {
     constructor(
         address timelock_,
         address admin_,
diff --git a/contracts/Timelock.sol b/contracts/Timelock.sol
index 35d95a8..8e5e87a 100644
--- a/contracts/Timelock.sol
+++ b/contracts/Timelock.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.7.0;
 
 import "./SafeMath.sol";
 
-contract Timelock {
+contract InstaTimelock {
     using SafeMath for uint;
 
     event NewAdmin(address indexed newAdmin);
diff --git a/contracts/TokenDelegate.sol b/contracts/TokenDelegate.sol
index 9b9e89f..6170214 100644
--- a/contracts/TokenDelegate.sol
+++ b/contracts/TokenDelegate.sol
@@ -4,8 +4,7 @@ pragma experimental ABIEncoderV2;
 import { TokenDelegateStorageV1, TokenEvents} from "./TokenInterfaces.sol";
 import { SafeMath } from "./SafeMath.sol";
 
-// TODO @thrilok209 @KaymasJain - Rename it
-contract TokenDelegate is TokenDelegateStorageV1, TokenEvents {
+contract InstaTokenDelegate is TokenDelegateStorageV1, TokenEvents {
     /// @notice Minimum time between mints
     uint32 public constant minimumTimeBetweenMints = 1 days * 7; // TODO @thrilok209 @KaymasJain - Replace it
 
diff --git a/contracts/TokenDelegator.sol b/contracts/TokenDelegator.sol
index 5061b9c..20c679f 100644
--- a/contracts/TokenDelegator.sol
+++ b/contracts/TokenDelegator.sol
@@ -3,7 +3,7 @@ pragma experimental ABIEncoderV2;
 
 import { TokenDelegatorStorage, TokenEvents } from "./TokenInterfaces.sol";
 
-contract TokenDelegator is TokenDelegatorStorage, TokenEvents {
+contract InstaTokenDelegator is TokenDelegatorStorage, TokenEvents {
     constructor(
         address account,
         address implementation_,