diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeAccount.java b/core-java-modules/core-java-concurrency-advanced-3/src/main/java/com/baeldung/atomicstampedreference/SafeAccount.java
similarity index 82%
rename from core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeAccount.java
rename to core-java-modules/core-java-concurrency-advanced-3/src/main/java/com/baeldung/atomicstampedreference/SafeAccount.java
index febfd481c3..fe41429e22 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/atomic/SafeAccount.java
+++ b/core-java-modules/core-java-concurrency-advanced-3/src/main/java/com/baeldung/atomicstampedreference/SafeAccount.java
@@ -1,12 +1,12 @@
-package com.baeldung.concurrent.atomic;
+package com.baeldung.atomicstampedreference;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicStampedReference;
 
 public class SafeAccount {
 
-    AtomicInteger stamp = new AtomicInteger(0);
-    AtomicStampedReference<Integer> balance = new AtomicStampedReference<>(0, 0);
+    private AtomicInteger stamp = new AtomicInteger(0);
+    private AtomicStampedReference<Integer> balance = new AtomicStampedReference<>(0, 0);
 
     public int getBalance() {
         return this.balance.get(new int[1]);
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeAccountTest.java b/core-java-modules/core-java-concurrency-advanced-3/src/test/java/com/baeldung/atomicstampedreference/ThreadSafeAccountUnitTest.java
similarity index 70%
rename from core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeAccountTest.java
rename to core-java-modules/core-java-concurrency-advanced-3/src/test/java/com/baeldung/atomicstampedreference/ThreadSafeAccountUnitTest.java
index b9a5fe7773..bd33d5b4ec 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeAccountTest.java
+++ b/core-java-modules/core-java-concurrency-advanced-3/src/test/java/com/baeldung/atomicstampedreference/ThreadSafeAccountUnitTest.java
@@ -1,12 +1,12 @@
-package com.baeldung.concurrent.atomic;
+package com.baeldung.atomicstampedreference;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ThreadSafeAccountTest {
+public class ThreadSafeAccountUnitTest {
 
     @Test
-    public void givenMultiThread_whenSafeAccountSetBalance() throws InterruptedException {
+    public void givenMultiThread_whenSafeAccount_thenSetBalance() throws InterruptedException {
         SafeAccount account = new SafeAccount();
         Thread t = new Thread(() -> {
             while (!account.withdrawal(100))