diff --git a/hazelcast/src/main/java/com/hazelcast/cluster/Joiner.java b/hazelcast/src/main/java/com/hazelcast/cluster/Joiner.java
index 232502f3c3d6..7ff56ce455e1 100644
--- a/hazelcast/src/main/java/com/hazelcast/cluster/Joiner.java
+++ b/hazelcast/src/main/java/com/hazelcast/cluster/Joiner.java
@@ -19,7 +19,7 @@
 import com.hazelcast.nio.Address;
 
 /**
- * This interface is deprecated and will be removed in 3.8. Look for the {@link com.hazelcast.spi.discovery}
+ * This interface is deprecated and will be removed in 4.0. Look for the {@link com.hazelcast.spi.discovery}
  * module as alternative.
  */
 @Deprecated
diff --git a/hazelcast/src/main/java/com/hazelcast/config/CacheConfig.java b/hazelcast/src/main/java/com/hazelcast/config/CacheConfig.java
index c518c2a2188c..6731b3d4a774 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/CacheConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/CacheConfig.java
@@ -229,7 +229,7 @@ private void initExpiryPolicyFactoryConfig(CacheSimpleConfig simpleConfig) throw
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public CacheConfigReadOnly<K, V> getAsReadOnly() {
         return new CacheConfigReadOnly<K, V>(this);
diff --git a/hazelcast/src/main/java/com/hazelcast/config/CacheEvictionConfig.java b/hazelcast/src/main/java/com/hazelcast/config/CacheEvictionConfig.java
index 4cc705cd01c7..c3b66b6d3033 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/CacheEvictionConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/CacheEvictionConfig.java
@@ -69,7 +69,7 @@ public CacheEvictionConfig(EvictionConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     @Override
     public CacheEvictionConfig getAsReadOnly() {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/CachePartitionLostListenerConfig.java b/hazelcast/src/main/java/com/hazelcast/config/CachePartitionLostListenerConfig.java
index de01343cc35a..4bdd9abafe28 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/CachePartitionLostListenerConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/CachePartitionLostListenerConfig.java
@@ -51,7 +51,7 @@ public CachePartitionLostListenerConfig(CachePartitionLostListenerConfig config)
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     @Override
     public CachePartitionLostListenerConfigReadOnly getAsReadOnly() {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/CacheSimpleConfig.java b/hazelcast/src/main/java/com/hazelcast/config/CacheSimpleConfig.java
index 6a89a663d109..f9ff4dd6c0f3 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/CacheSimpleConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/CacheSimpleConfig.java
@@ -146,7 +146,7 @@ public CacheSimpleConfig() {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public CacheSimpleConfig getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/CacheSimpleEntryListenerConfig.java b/hazelcast/src/main/java/com/hazelcast/config/CacheSimpleEntryListenerConfig.java
index c354db68410b..d6ea9bc8b289 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/CacheSimpleEntryListenerConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/CacheSimpleEntryListenerConfig.java
@@ -42,7 +42,7 @@ public CacheSimpleEntryListenerConfig() {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public CacheSimpleEntryListenerConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/DiscoveryConfig.java b/hazelcast/src/main/java/com/hazelcast/config/DiscoveryConfig.java
index 2db31efe572b..344010b2db58 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/DiscoveryConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/DiscoveryConfig.java
@@ -52,7 +52,7 @@ protected DiscoveryConfig(DiscoveryServiceProvider discoveryServiceProvider, Nod
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public DiscoveryConfig getAsReadOnly() {
         if (readonly != null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/EntryListenerConfig.java b/hazelcast/src/main/java/com/hazelcast/config/EntryListenerConfig.java
index 5c703e788f33..1f0fc125c301 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/EntryListenerConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/EntryListenerConfig.java
@@ -76,7 +76,7 @@ public EntryListenerConfig(EntryListenerConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     @Override
     public EntryListenerConfigReadOnly getAsReadOnly() {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/EvictionConfig.java b/hazelcast/src/main/java/com/hazelcast/config/EvictionConfig.java
index 28a24cadd55c..04e2ce230809 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/EvictionConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/EvictionConfig.java
@@ -172,7 +172,7 @@ public enum MaxSizePolicy {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public EvictionConfig getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/ExecutorConfig.java b/hazelcast/src/main/java/com/hazelcast/config/ExecutorConfig.java
index 9ac1c0046f3c..286d2951ad43 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/ExecutorConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/ExecutorConfig.java
@@ -64,7 +64,7 @@ public ExecutorConfig(ExecutorConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public ExecutorConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/ItemListenerConfig.java b/hazelcast/src/main/java/com/hazelcast/config/ItemListenerConfig.java
index afdea192414a..922c8bf878ae 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/ItemListenerConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/ItemListenerConfig.java
@@ -50,7 +50,7 @@ public ItemListenerConfig(ItemListenerConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     @Override
     public ItemListenerConfigReadOnly getAsReadOnly() {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/JobTrackerConfig.java b/hazelcast/src/main/java/com/hazelcast/config/JobTrackerConfig.java
index e59b2f4d9bd6..027a90ed74cb 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/JobTrackerConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/JobTrackerConfig.java
@@ -160,7 +160,7 @@ public void setChunkSize(int chunkSize) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public JobTrackerConfig getAsReadOnly() {
         return new JobTrackerConfigReadOnly(this);
diff --git a/hazelcast/src/main/java/com/hazelcast/config/ListConfig.java b/hazelcast/src/main/java/com/hazelcast/config/ListConfig.java
index eb40141bd9e7..c0405aa28820 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/ListConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/ListConfig.java
@@ -38,7 +38,7 @@ public ListConfig(ListConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     @Override
     public ListConfig getAsReadOnly() {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/ListenerConfig.java b/hazelcast/src/main/java/com/hazelcast/config/ListenerConfig.java
index bb197556fba3..692d314ec809 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/ListenerConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/ListenerConfig.java
@@ -68,7 +68,7 @@ public ListenerConfig(EventListener implementation) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public ListenerConfig getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/LockConfig.java b/hazelcast/src/main/java/com/hazelcast/config/LockConfig.java
index 9a7ab8d4317e..3d9c59730d6b 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/LockConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/LockConfig.java
@@ -109,7 +109,7 @@ public LockConfig setQuorumName(String quorumName) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public LockConfig getAsReadOnly() {
         return new LockConfigReadonly(this);
diff --git a/hazelcast/src/main/java/com/hazelcast/config/MapAttributeConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MapAttributeConfig.java
index d7f63819fd1d..fc8d5875083a 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/MapAttributeConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/MapAttributeConfig.java
@@ -69,7 +69,7 @@ public MapAttributeConfig(MapAttributeConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public MapAttributeConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/MapConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MapConfig.java
index 8beddfd3af4b..0ca840632e7b 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/MapConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/MapConfig.java
@@ -200,7 +200,7 @@ public MapConfig(MapConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public MapConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/MapIndexConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MapIndexConfig.java
index eac1fb87bef3..0afef673eab0 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/MapIndexConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/MapIndexConfig.java
@@ -63,7 +63,7 @@ public MapIndexConfig(MapIndexConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public MapIndexConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/MapPartitionLostListenerConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MapPartitionLostListenerConfig.java
index d34d59deab3b..60529354c8c6 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/MapPartitionLostListenerConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/MapPartitionLostListenerConfig.java
@@ -47,7 +47,7 @@ public MapPartitionLostListenerConfig(MapPartitionLostListenerConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     @Override
     public MapPartitionLostListenerConfigReadOnly getAsReadOnly() {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/MapStoreConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MapStoreConfig.java
index 82ef83bf9311..85ce09fab649 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/MapStoreConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/MapStoreConfig.java
@@ -85,7 +85,7 @@ public MapStoreConfig(MapStoreConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public MapStoreConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/MaxSizeConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MaxSizeConfig.java
index 640a6bc704f7..7310eb6873b7 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/MaxSizeConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/MaxSizeConfig.java
@@ -112,7 +112,7 @@ public enum MaxSizePolicy {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public MaxSizeConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/MemberAttributeConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MemberAttributeConfig.java
index ecd0237c4ec7..2349af1fe404 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/MemberAttributeConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/MemberAttributeConfig.java
@@ -117,7 +117,7 @@ public void removeAttribute(String key) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public MemberAttributeConfig asReadOnly() {
         return new MemberAttributeConfigReadOnly(this);
diff --git a/hazelcast/src/main/java/com/hazelcast/config/MultiMapConfig.java b/hazelcast/src/main/java/com/hazelcast/config/MultiMapConfig.java
index 8dc19673943f..d56a3f122086 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/MultiMapConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/MultiMapConfig.java
@@ -74,7 +74,7 @@ public MultiMapConfig(MultiMapConfig defConfig) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public MultiMapConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/NearCacheConfig.java b/hazelcast/src/main/java/com/hazelcast/config/NearCacheConfig.java
index 59f7b502c522..d59838542b49 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/NearCacheConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/NearCacheConfig.java
@@ -187,7 +187,7 @@ public NearCacheConfig(NearCacheConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public NearCacheConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/PartitioningStrategyConfig.java b/hazelcast/src/main/java/com/hazelcast/config/PartitioningStrategyConfig.java
index bc83b8b9910e..34c2a41ebb58 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/PartitioningStrategyConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/PartitioningStrategyConfig.java
@@ -49,7 +49,7 @@ public PartitioningStrategyConfig(PartitioningStrategy partitionStrategy) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public PartitioningStrategyConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/PredicateConfig.java b/hazelcast/src/main/java/com/hazelcast/config/PredicateConfig.java
index 758a04674b03..3ca0d9258bdf 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/PredicateConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/PredicateConfig.java
@@ -73,7 +73,7 @@ public PredicateConfig(Predicate implementation) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public PredicateConfig getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/QueryCacheConfig.java b/hazelcast/src/main/java/com/hazelcast/config/QueryCacheConfig.java
index 53fe38cded44..35b38b1cba0e 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/QueryCacheConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/QueryCacheConfig.java
@@ -148,7 +148,7 @@ public QueryCacheConfig(QueryCacheConfig other) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public QueryCacheConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/QueueConfig.java b/hazelcast/src/main/java/com/hazelcast/config/QueueConfig.java
index daa83859e0cf..72b28467267b 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/QueueConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/QueueConfig.java
@@ -82,7 +82,7 @@ public QueueConfig(QueueConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public QueueConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/QueueStoreConfig.java b/hazelcast/src/main/java/com/hazelcast/config/QueueStoreConfig.java
index 2d9a6d3f111a..b415a211b437 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/QueueStoreConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/QueueStoreConfig.java
@@ -61,7 +61,7 @@ public QueueStoreConfig setStoreImplementation(QueueStore storeImplementation) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public QueueStoreConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/ReliableTopicConfig.java b/hazelcast/src/main/java/com/hazelcast/config/ReliableTopicConfig.java
index aac9d4ae1ce1..1726ce876348 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/ReliableTopicConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/ReliableTopicConfig.java
@@ -278,7 +278,7 @@ public String toString() {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public ReliableTopicConfig getAsReadOnly() {
         return new ReliableTopicConfigReadOnly(this);
diff --git a/hazelcast/src/main/java/com/hazelcast/config/ReplicatedMapConfig.java b/hazelcast/src/main/java/com/hazelcast/config/ReplicatedMapConfig.java
index 19d20e7ce29c..fc4f84f56ec9 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/ReplicatedMapConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/ReplicatedMapConfig.java
@@ -260,7 +260,7 @@ public void setAsyncFillup(boolean asyncFillup) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public ReplicatedMapConfig getAsReadOnly() {
         return new ReplicatedMapConfigReadOnly(this);
diff --git a/hazelcast/src/main/java/com/hazelcast/config/RingbufferConfig.java b/hazelcast/src/main/java/com/hazelcast/config/RingbufferConfig.java
index d48b04c7db53..2717de94e1a1 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/RingbufferConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/RingbufferConfig.java
@@ -318,7 +318,7 @@ public RingbufferConfig setRingbufferStoreConfig(RingbufferStoreConfig ringbuffe
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public RingbufferConfig getAsReadOnly() {
         return new RingbufferConfigReadonly(this);
diff --git a/hazelcast/src/main/java/com/hazelcast/config/RingbufferStoreConfig.java b/hazelcast/src/main/java/com/hazelcast/config/RingbufferStoreConfig.java
index 97e5527edc63..7b9a5e9fb86d 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/RingbufferStoreConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/RingbufferStoreConfig.java
@@ -123,7 +123,7 @@ public String toString() {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public RingbufferStoreConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/SemaphoreConfig.java b/hazelcast/src/main/java/com/hazelcast/config/SemaphoreConfig.java
index 8424dd4d4456..e4bf7071e478 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/SemaphoreConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/SemaphoreConfig.java
@@ -65,7 +65,7 @@ public SemaphoreConfig(SemaphoreConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public SemaphoreConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/SetConfig.java b/hazelcast/src/main/java/com/hazelcast/config/SetConfig.java
index 25a15618ed93..ce64ac7db679 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/SetConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/SetConfig.java
@@ -38,7 +38,7 @@ public SetConfig(SetConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     @Override
     public SetConfigReadOnly getAsReadOnly() {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/TopicConfig.java b/hazelcast/src/main/java/com/hazelcast/config/TopicConfig.java
index 49e48625d52e..5980ceed4f46 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/TopicConfig.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/TopicConfig.java
@@ -71,7 +71,7 @@ public TopicConfig(TopicConfig config) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public TopicConfigReadOnly getAsReadOnly() {
         if (readOnly == null) {
diff --git a/hazelcast/src/main/java/com/hazelcast/config/WanReplicationRef.java b/hazelcast/src/main/java/com/hazelcast/config/WanReplicationRef.java
index 0dbcda90c389..aa2165dababd 100644
--- a/hazelcast/src/main/java/com/hazelcast/config/WanReplicationRef.java
+++ b/hazelcast/src/main/java/com/hazelcast/config/WanReplicationRef.java
@@ -60,7 +60,7 @@ public WanReplicationRef(WanReplicationRef ref) {
      * Gets immutable version of this configuration.
      *
      * @return Immutable version of this configuration.
-     * @deprecated this method will be removed in 3.9; it is meant for internal usage only.
+     * @deprecated this method will be removed in 4.0; it is meant for internal usage only.
      */
     public WanReplicationRefReadOnly getAsReadOnly() {
         if (readOnly == null) {