diff --git a/src/v1.1/FiatTokenV1_1.sol b/src/v1.1/FiatTokenV1_1.sol
deleted file mode 100644
index 04a18e7..0000000
--- a/src/v1.1/FiatTokenV1_1.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.20;
-
-import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
-import "../v1/FiatTokenV1.sol";
-
-/// @custom:security-contact snggeng@gmail.com
-contract FiatTokenV1_1 is FiatTokenV1 {
-    function decimals() public pure virtual override(ERC20Upgradeable) returns (uint8) {
-        return 6;
-    }
-
-    function version() public pure virtual override(FiatTokenV1) returns (string memory) {
-        return "1.1";
-    }
-}
diff --git a/src/v1/FiatTokenV1.sol b/src/v1/FiatTokenV1.sol
index a085238..f6746c6 100644
--- a/src/v1/FiatTokenV1.sol
+++ b/src/v1/FiatTokenV1.sol
@@ -126,7 +126,11 @@ contract FiatTokenV1 is
     }
 
     function version() public pure virtual returns (string memory) {
-        return "v1";
+        return "1";
+    }
+
+    function decimals() public pure virtual override(ERC20Upgradeable) returns (uint8) {
+        return 6;
     }
 
     function _authorizeUpgrade(address newImplementation) internal override onlyRole(UPGRADER_ROLE) {}
diff --git a/test/v1.1/FiatTokenV1_1.t.sol b/test/v1.1/FiatTokenV1_1.t.sol
deleted file mode 100644
index 4cf39a7..0000000
--- a/test/v1.1/FiatTokenV1_1.t.sol
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
-
-import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";
-
-import {Test} from "forge-std/Test.sol";
-import {FiatTokenV1_1} from "../../src/v1.1/FiatTokenV1_1.sol";
-
-contract FiatTokenV2Test is Test {
-    FiatTokenV1_1 public fiatTokenV1_1;
-    ERC1967Proxy public proxy;
-    address public owner;
-    address public defaultAdmin;
-    address public pauser;
-    address public minter;
-    address public upgrader;
-    address public rescuer;
-    address public blacklister;
-    address public unauthorized;
-    address public trustedAddress;
-    string public tokenName = "FiatTokenV1_1";
-    string public tokenSymbol = "FIAT";
-
-    // events
-    event Blacklisted(address indexed account);
-    event UnBlacklisted(address indexed account);
-
-    function setUp() public {
-        owner = address(this);
-        defaultAdmin = vm.addr(1);
-        pauser = vm.addr(2);
-        minter = vm.addr(3);
-        upgrader = vm.addr(4);
-        rescuer = vm.addr(5);
-        blacklister = vm.addr(6);
-        unauthorized = vm.addr(7);
-        trustedAddress = address(0x66787300CCc33F17643a02635ca96d54301aE2a8);
-
-        // Deploy the token implementation
-        fiatTokenV1_1 = new FiatTokenV1_1();
-        // Deploy the proxy and initialize the contract through the proxy
-        vm.prank(trustedAddress);
-        proxy = new ERC1967Proxy(
-            address(fiatTokenV1_1),
-            abi.encodeCall(
-                fiatTokenV1_1.initialize,
-                (defaultAdmin, pauser, minter, upgrader, rescuer, blacklister, tokenName, tokenSymbol)
-            )
-        );
-        // Attach the FiatTokenV1_1 interface to the deployed proxy
-        fiatTokenV1_1 = FiatTokenV1_1(address(proxy));
-    }
-
-    function testVersion() public {
-        assertEq(fiatTokenV1_1.version(), "1.1");
-    }
-
-    function testDecimals() public {
-        assertEq(fiatTokenV1_1.decimals(), 6);
-    }
-}
diff --git a/test/v1/FiatTokenV1.t.sol b/test/v1/FiatTokenV1.t.sol
index c5e8994..d99edb6 100644
--- a/test/v1/FiatTokenV1.t.sol
+++ b/test/v1/FiatTokenV1.t.sol
@@ -21,7 +21,7 @@ import {Ramen} from "../../src/mocks/Ramen.sol";
 contract FiatTokenV99 is FiatTokenV1 {
     // solhint-disable-next-line foundry-test-functions
     function version() public pure virtual override(FiatTokenV1) returns (string memory) {
-        return "v99";
+        return "99";
     }
 }
 
@@ -98,7 +98,7 @@ contract FiatTokenV1Test is Test {
     // ERC 20 behavior
 
     function testVersion() public {
-        assertEq(fiatTokenV1.version(), "v1");
+        assertEq(fiatTokenV1.version(), "1");
     }
 
     function testName() public {
@@ -110,7 +110,7 @@ contract FiatTokenV1Test is Test {
     }
 
     function testDecimals() public {
-        assertEq(fiatTokenV1.decimals(), 18);
+        assertEq(fiatTokenV1.decimals(), 6);
     }
 
     function testBalanceOf() public {
@@ -503,8 +503,8 @@ contract FiatTokenV1Test is Test {
         // new implementation contract
         FiatTokenV99 fiatTokenV99 = new FiatTokenV99();
         address newImplementationAddress = address(fiatTokenV99);
-        assertEq(fiatTokenV99.version(), "v99");
-        assertEq(fiatTokenV1.version(), "v1");
+        assertEq(fiatTokenV99.version(), "99");
+        assertEq(fiatTokenV1.version(), "1");
         // upgrade contract
         vm.prank(upgrader);
         fiatTokenV1.upgradeToAndCall(newImplementationAddress, "");
@@ -512,7 +512,7 @@ contract FiatTokenV1Test is Test {
         // verify implementation address is updated
         assertEq(newImplementationAddress, updatedImplementationAddress);
         // verify version() function implementation is updated
-        assertEq(fiatTokenV1.version(), "v99");
+        assertEq(fiatTokenV1.version(), "99");
     }
 
     // Trusted addresses