diff --git a/src/main/java/ru/touchin/roboswag/core/observables/BaseChangeable.java b/src/main/java/ru/touchin/roboswag/core/observables/BaseChangeable.java
index a4efc1c..86ca15d 100644
--- a/src/main/java/ru/touchin/roboswag/core/observables/BaseChangeable.java
+++ b/src/main/java/ru/touchin/roboswag/core/observables/BaseChangeable.java
@@ -71,7 +71,7 @@ public abstract class BaseChangeable<TValue, TReturnValue> implements Serializab
      */
     @Nullable
     public TValue get() {
-        return valueSubject.getValue().getValue();
+        return valueSubject.getValue().get();
     }
 
     /**
diff --git a/src/main/java/ru/touchin/roboswag/core/observables/Changeable.java b/src/main/java/ru/touchin/roboswag/core/observables/Changeable.java
index e878f38..243009c 100644
--- a/src/main/java/ru/touchin/roboswag/core/observables/Changeable.java
+++ b/src/main/java/ru/touchin/roboswag/core/observables/Changeable.java
@@ -46,7 +46,7 @@ public class Changeable<T> extends BaseChangeable<T, T> {
     @Override
     //COMPATIBILITY NOTE: in RxJava2 it should be Observable<Optional<T>>
     public Observable<T> observe() {
-        return observeOptionalValue().map(Optional::getValue);
+        return observeOptionalValue().map(Optional::get);
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/core/observables/NonNullChangeable.java b/src/main/java/ru/touchin/roboswag/core/observables/NonNullChangeable.java
index 85b54de..731913d 100644
--- a/src/main/java/ru/touchin/roboswag/core/observables/NonNullChangeable.java
+++ b/src/main/java/ru/touchin/roboswag/core/observables/NonNullChangeable.java
@@ -68,10 +68,10 @@ public class NonNullChangeable<T> extends BaseChangeable<T, T> {
     public Observable<T> observe() {
         return observeOptionalValue()
                 .map(optional -> {
-                    if (optional.getValue() == null) {
+                    if (optional.get() == null) {
                         throw new ShouldNotHappenException();
                     }
-                    return optional.getValue();
+                    return optional.get();
                 });
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java b/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
index 00363e5..f4e2f30 100644
--- a/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
+++ b/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
@@ -124,7 +124,7 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
 
     @Nullable
     private Optional<TStoreObject> returnDefaultValueIfNull(@NonNull final Optional<TStoreObject> storeObject, @Nullable final TObject defaultValue) {
-        if (storeObject.getValue() != null || defaultValue == null) {
+        if (storeObject.get() != null || defaultValue == null) {
             return storeObject;
         }
 
@@ -171,7 +171,7 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
         final Observable<Optional<TObject>> result = storeValueObservable
                 .map(storeObject -> {
                     try {
-                        return new Optional<>(converter.toObject(objectType, storeObjectType, storeObject.getValue()));
+                        return new Optional<>(converter.toObject(objectType, storeObjectType, storeObject.get()));
                     } catch (final Converter.ConversionException exception) {
                         STORABLE_LC_GROUP.w(exception, "Exception while trying to converting value of '%s' from store %s by %s",
                                 key, storeObject, store, converter);
@@ -246,7 +246,7 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
                                 key, newValue, store, converter);
                         return Completable.error(exception);
                     }
-                    if (checkForEqualityBeforeSet && ObjectUtils.equals(newStoreValue, oldStoreValue.getValue())) {
+                    if (checkForEqualityBeforeSet && ObjectUtils.equals(newStoreValue, oldStoreValue.get())) {
                         return Completable.complete();
                     }
                     return store.storeObject(storeObjectType, key, newStoreValue)
diff --git a/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java b/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java
index f5adf78..714fb4d 100644
--- a/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java
+++ b/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java
@@ -58,7 +58,7 @@ public class Migration<TKey> {
     @NonNull
     private Single<Long> loadCurrentVersion(@NonNull final TKey key) {
         return versionsStore.loadObject(Long.class, key)
-                .map(version -> version.getValue() != null ? version.getValue() : DEFAULT_VERSION)
+                .map(version -> version.get() != null ? version.get() : DEFAULT_VERSION)
                 .onErrorResumeNext(throwable
                         -> Single.error(new MigrationException(String.format("Can't get version of '%s' from %s", key, versionsStore), throwable)));
     }
diff --git a/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java b/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java
index 4a5a1f2..d7f88a6 100644
--- a/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java
+++ b/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java
@@ -53,7 +53,7 @@ public class Storable<TKey, TObject, TStoreObject> extends BaseStorable<TKey, TO
     @NonNull
     @Override
     public Observable<TObject> observe() {
-        return observeOptionalValue().map(Optional::getValue);
+        return observeOptionalValue().map(Optional::get);
     }
 
     /**
diff --git a/src/main/java/ru/touchin/roboswag/core/observables/storable/concrete/NonNullStorable.java b/src/main/java/ru/touchin/roboswag/core/observables/storable/concrete/NonNullStorable.java
index 99491d3..2b7b0aa 100644
--- a/src/main/java/ru/touchin/roboswag/core/observables/storable/concrete/NonNullStorable.java
+++ b/src/main/java/ru/touchin/roboswag/core/observables/storable/concrete/NonNullStorable.java
@@ -51,10 +51,10 @@ public class NonNullStorable<TKey, TObject, TStoreObject> extends BaseStorable<T
     public Observable<TObject> observe() {
         return observeOptionalValue()
                 .map(optional -> {
-                    if (optional.getValue() == null) {
+                    if (optional.get() == null) {
                         throw new ShouldNotHappenException();
                     }
-                    return optional.getValue();
+                    return optional.get();
                 });
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/core/utils/Optional.java b/src/main/java/ru/touchin/roboswag/core/utils/Optional.java
index 4e07d25..86a8493 100644
--- a/src/main/java/ru/touchin/roboswag/core/utils/Optional.java
+++ b/src/main/java/ru/touchin/roboswag/core/utils/Optional.java
@@ -46,7 +46,7 @@ public class Optional<T> implements Serializable {
      * @return Holding object.
      */
     @Nullable
-    public T getValue() {
+    public T get() {
         return value;
     }