diff --git a/Changes b/Changes
index 8c8a18c7f..baa589003 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+aabb291268c0977e1444b0901e816db4467d6806
+	Modules: *
+	'vital#{plugin-name}#of()' was renamed to 'vital#{plugin-name}#new()'.
 982d3cb87ef788f4607fc61f1fd20ec2e3975479
 	Modules: Vim.Guard
 	Guard.store() API has changed to take a single List instance instead of arguments, due to the
diff --git a/autoload/vital/_vital.vim b/autoload/vital/_vital.vim
index ae19f5bad..9eba17768 100644
--- a/autoload/vital/_vital.vim
+++ b/autoload/vital/_vital.vim
@@ -1,5 +1,5 @@
 let s:_plugin_name = expand('<sfile>:t:r')
 
 function! vital#{s:_plugin_name}#new() abort
-  return vital#{s:_plugin_name[1:]}#of()
+  return vital#{s:_plugin_name[1:]}#new()
 endfunction
diff --git a/autoload/vital/vital.vim b/autoload/vital/vital.vim
index 4f9010cc9..d428cc261 100644
--- a/autoload/vital/vital.vim
+++ b/autoload/vital/vital.vim
@@ -21,7 +21,7 @@ else
   endfunction
 endif
 
-function! vital#{s:plugin_name}#of() abort
+function! vital#{s:plugin_name}#new() abort
   return s:new(s:plugin_name)
 endfunction
 
@@ -170,7 +170,7 @@ function! s:_import(name) abort dict
   let s:loaded[a:name] = export_module
   if has_key(module, '_vital_loaded')
     try
-      call module._vital_loaded(vital#{s:plugin_name}#of())
+      call module._vital_loaded(vital#{s:plugin_name}#new())
     catch
       unlet s:loaded[a:name]
       throw 'vital: fail to call ._vital_loaded(): ' . v:exception
diff --git a/autoload/vitalizer.vim b/autoload/vitalizer.vim
index fe7b05bde..97affa65b 100644
--- a/autoload/vitalizer.vim
+++ b/autoload/vitalizer.vim
@@ -8,7 +8,7 @@ let s:LOADER_FILES = [
 \   'autoload/vital/vital.vim',
 \   'autoload/vital/_vital.vim',
 \ ]
-let s:V = vital#vital#of()
+let s:V = vital#vital#new()
 let s:P = s:V.import('Prelude')
 let s:L = s:V.import('Data.List')
 let s:S = s:V.import('Data.String')
diff --git a/test/Bitwise.vimspec b/test/Bitwise.vimspec
index 8905ccef6..10ce3bcba 100644
--- a/test/Bitwise.vimspec
+++ b/test/Bitwise.vimspec
@@ -1,6 +1,6 @@
 Describe Bitwise
   Before all
-    let B = vital#of('vital').import('Bitwise')
+    let B = vital#vital#new().import('Bitwise')
   End
 
   Describe .lshift()
diff --git a/test/ConcurrentProcess.vim b/test/ConcurrentProcess.vim
index 327b6fe4e..6f003b206 100644
--- a/test/ConcurrentProcess.vim
+++ b/test/ConcurrentProcess.vim
@@ -4,7 +4,7 @@ let s:suite = themis#suite('ConcurrentProcess')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:CP = vital#of('vital').import('ConcurrentProcess')
+  let s:CP = vital#vital#new().import('ConcurrentProcess')
 endfunction
 
 function! s:suite.before_each() abort
diff --git a/test/Data/Base64.vimspec b/test/Data/Base64.vimspec
index 0a22cbe8f..3b33ce8cb 100644
--- a/test/Data/Base64.vimspec
+++ b/test/Data/Base64.vimspec
@@ -1,6 +1,6 @@
 Describe Data.Base64
   Before all
-    let B = vital#of('vital').import('Data.Base64')
+    let B = vital#vital#new().import('Data.Base64')
   End
 
   Describe .encode()
diff --git a/test/Data/BigNum.vim b/test/Data/BigNum.vim
index c67020eea..4f5131e10 100644
--- a/test/Data/BigNum.vim
+++ b/test/Data/BigNum.vim
@@ -2,7 +2,7 @@ let s:suite = themis#suite('Data.BigNum')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:BigNum = vital#of('vital').import('Data.BigNum')
+  let s:BigNum = vital#vital#new().import('Data.BigNum')
 endfunction
 
 function! s:suite.after()
diff --git a/test/Data/Closure.vimspec b/test/Data/Closure.vimspec
index 5eb60c8e3..d1cd20a27 100644
--- a/test/Data/Closure.vimspec
+++ b/test/Data/Closure.vimspec
@@ -1,6 +1,6 @@
 Describe Data.Closure
   Before all
-    let C = vital#of('vital').import('Data.Closure')
+    let C = vital#vital#new().import('Data.Closure')
   End
 
   Describe .build()
diff --git a/test/Data/Counter.vimspec b/test/Data/Counter.vimspec
index 329be69d7..bf8454dbe 100644
--- a/test/Data/Counter.vimspec
+++ b/test/Data/Counter.vimspec
@@ -1,6 +1,6 @@
 Describe Data.Counter
   Before all
-    let Counter = vital#of('vital').import('Data.Counter')
+    let Counter = vital#vital#new().import('Data.Counter')
   End
 
   Describe .new()
diff --git a/test/Data/Dict.vimspec b/test/Data/Dict.vimspec
index 8ef1f6191..00dbf5db9 100644
--- a/test/Data/Dict.vimspec
+++ b/test/Data/Dict.vimspec
@@ -1,6 +1,6 @@
 Describe Data.Dict
   Before all
-    let D = vital#of('vital').import('Data.Dict')
+    let D = vital#vital#new().import('Data.Dict')
   End
 
   Describe .make()
diff --git a/test/Data/LazyList.vimspec b/test/Data/LazyList.vimspec
index 0c84479c9..ad0896841 100644
--- a/test/Data/LazyList.vimspec
+++ b/test/Data/LazyList.vimspec
@@ -1,6 +1,6 @@
 Describe Data.LazyList
   Before all
-    let LazyList = vital#of('vital').import('Data.LazyList')
+    let LazyList = vital#vital#new().import('Data.LazyList')
   End
 
   Describe .from_list()
diff --git a/test/Data/List.vimspec b/test/Data/List.vimspec
index b2480b020..aeec3dc0e 100644
--- a/test/Data/List.vimspec
+++ b/test/Data/List.vimspec
@@ -1,6 +1,6 @@
 Describe Data.List
   Before all
-    let List = vital#of('vital').import('Data.List')
+    let List = vital#vital#new().import('Data.List')
   End
 
   Describe .pop()
diff --git a/test/Data/Optional.vimspec b/test/Data/Optional.vimspec
index 7074d63d2..bc06d8221 100644
--- a/test/Data/Optional.vimspec
+++ b/test/Data/Optional.vimspec
@@ -1,6 +1,6 @@
 Describe Data.Optional
   Before all
-    let O = vital#of('vital').import('Data.Optional')
+    let O = vital#vital#new().import('Data.Optional')
   End
 
   Describe .none()
@@ -169,7 +169,7 @@ Describe Data.Optional
         " Note:
         " This is workaround because 'O' is defined in outer 'Before all'
         " and it can't be refered here.
-        let O = vital#of('vital').import('Data.Optional')
+        let O = vital#vital#new().import('Data.Optional')
 
         if a:b == 0
           return O.none()
diff --git a/test/Data/OrderedSet.vimspec b/test/Data/OrderedSet.vimspec
index ad507af0f..bdadf4dd1 100644
--- a/test/Data/OrderedSet.vimspec
+++ b/test/Data/OrderedSet.vimspec
@@ -1,6 +1,6 @@
 Describe Data.OrderedSet
   Before all
-    let OrderedSet = vital#of('vital').import('Data.OrderedSet')
+    let OrderedSet = vital#vital#new().import('Data.OrderedSet')
   End
 
   Describe .push()
diff --git a/test/Data/Set.vim b/test/Data/Set.vim
index 3c42a094c..c3046f515 100644
--- a/test/Data/Set.vim
+++ b/test/Data/Set.vim
@@ -2,7 +2,7 @@ let s:suite = themis#suite('Data.Set')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:S = vital#of('vital').import('Data.Set')
+  let s:S = vital#vital#new().import('Data.Set')
   let s:xs = s:S.set([1,2,3,4,5])
   let s:ys = s:S.set([3,4,5,6,7])
   call themis#func_alias({'set': s:S.set()})
diff --git a/test/Data/String.vim b/test/Data/String.vim
index 3f6e6aeb5..e802323c6 100644
--- a/test/Data/String.vim
+++ b/test/Data/String.vim
@@ -5,7 +5,7 @@ let s:suite = themis#suite('Data.String')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:String = vital#of('vital').import('Data.String')
+  let s:String = vital#vital#new().import('Data.String')
 endfunction
 
 function! s:suite.after()
diff --git a/test/Data/String.vimspec b/test/Data/String.vimspec
index 3a087a4cc..f4648c0ae 100644
--- a/test/Data/String.vimspec
+++ b/test/Data/String.vimspec
@@ -1,7 +1,7 @@
 
 Describe Data.String
   Before all
-    let Vital = vital#of('vital')
+    let Vital = vital#vital#new()
     let Path = Vital.import('System.Filepath')
     let String = Vital.import('Data.String')
   End
diff --git a/test/Data/String/Interpolation.vimspec b/test/Data/String/Interpolation.vimspec
index e22662f0b..122aa57eb 100644
--- a/test/Data/String/Interpolation.vimspec
+++ b/test/Data/String/Interpolation.vimspec
@@ -1,7 +1,7 @@
 Describe Data.String.Interpolation
 
   Before all
-    let g:I = vital#of('vital').import('Data.String.Interpolation')
+    let g:I = vital#vital#new().import('Data.String.Interpolation')
 
     function! InterpolationFunc() abort
       let year = 2015
diff --git a/test/Database/SQLite.vimspec b/test/Database/SQLite.vimspec
index 2452ba22f..1b378c692 100644
--- a/test/Database/SQLite.vimspec
+++ b/test/Database/SQLite.vimspec
@@ -2,7 +2,7 @@ scriptencoding utf-8
 
 Describe Database.SQLite
   Before all
-    let SQLite = vital#of('vital').import('Database.SQLite')
+    let SQLite = vital#vital#new().import('Database.SQLite')
   End
 
   Describe .is_available()
diff --git a/test/DateTime.vimspec b/test/DateTime.vimspec
index f86d14a41..1344a0c87 100644
--- a/test/DateTime.vimspec
+++ b/test/DateTime.vimspec
@@ -1,6 +1,6 @@
 Describe DateTime
   Before all
-    let DT = vital#of('vital').import('DateTime')
+    let DT = vital#vital#new().import('DateTime')
     " TODO set timezone for test here
   End
 
diff --git a/test/Interpreter/Brainf__k.vimspec b/test/Interpreter/Brainf__k.vimspec
index b2bfa150b..1c3c81ae3 100644
--- a/test/Interpreter/Brainf__k.vimspec
+++ b/test/Interpreter/Brainf__k.vimspec
@@ -2,7 +2,7 @@ scriptencoding utf-8
 
 Describe Interpreter.Brainf__k
   Before all
-    let BF = vital#of('vital').import('Interpreter.Brainf__k')
+    let BF = vital#vital#new().import('Interpreter.Brainf__k')
   End
 
   Describe .run_vim_parse_execute()
diff --git a/test/Locale/Message.vimspec b/test/Locale/Message.vimspec
index ff4e58a77..daae6fe35 100644
--- a/test/Locale/Message.vimspec
+++ b/test/Locale/Message.vimspec
@@ -4,7 +4,7 @@ let s:text_path = 'test/Locale/MessageText/%s.txt'
 
 Describe Locale.Message
   Before all
-    let M = vital#of('vital').import('Locale.Message')
+    let M = vital#vital#new().import('Locale.Message')
   End
 
   Before each
diff --git a/test/Math.vim b/test/Math.vim
index 4f9e30436..7a685f4e5 100644
--- a/test/Math.vim
+++ b/test/Math.vim
@@ -4,7 +4,7 @@ let s:suite = themis#suite('Math')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:M = vital#of('vital').import('Math')
+  let s:M = vital#vital#new().import('Math')
 endfunction
 
 function! s:suite.modulo()
diff --git a/test/OptionParser.vimspec b/test/OptionParser.vimspec
index 9d5eadc01..65f9b69bc 100644
--- a/test/OptionParser.vimspec
+++ b/test/OptionParser.vimspec
@@ -28,7 +28,7 @@ endfunction
 Describe OptionParser
 
   Before all
-    let O = vital#of('vital').import('OptionParser')
+    let O = vital#vital#new().import('OptionParser')
   End
 
   Describe .new()
diff --git a/test/Prelude.vimspec b/test/Prelude.vimspec
index ae074c70f..40844f81f 100644
--- a/test/Prelude.vimspec
+++ b/test/Prelude.vimspec
@@ -2,7 +2,7 @@ scriptencoding utf-8
 
 Describe Prelude
   Before all
-    let P = vital#of('vital').import('Prelude')
+    let P = vital#vital#new().import('Prelude')
   End
 
   Describe .is_numeric()
diff --git a/test/Process.vimspec b/test/Process.vimspec
index 47a922467..b6f6d5bd1 100644
--- a/test/Process.vimspec
+++ b/test/Process.vimspec
@@ -3,7 +3,7 @@ scriptencoding utf-8
 
 Describe Process
   Before all
-    let Process = vital#of('vital').import('Process')
+    let Process = vital#vital#new().import('Process')
   End
 
   Describe .system()
diff --git a/test/ProcessManager.vimspec b/test/ProcessManager.vimspec
index e10fca0e9..e15a84af2 100644
--- a/test/ProcessManager.vimspec
+++ b/test/ProcessManager.vimspec
@@ -1,11 +1,11 @@
 Describe ProcessManager
   Before all
-    let PM = vital#of('vital').import('ProcessManager')
+    let PM = vital#vital#new().import('ProcessManager')
   End
 
   Describe .is_available()
     It behaves the same as has_vimproc()
-      let P = vital#of('vital').import('Process')
+      let P = vital#vital#new().import('Process')
       Assert Equals(P.has_vimproc(), PM.is_available())
     End
   End
diff --git a/test/Random.vimspec b/test/Random.vimspec
index 7c2c60122..ff9d1f032 100644
--- a/test/Random.vimspec
+++ b/test/Random.vimspec
@@ -1,6 +1,6 @@
 Describe Random
   Before all
-    let R = vital#of('vital').import('Random')
+    let R = vital#vital#new().import('Random')
   End
 
   Describe .next()
diff --git a/test/Random/Mt19937ar.vimspec b/test/Random/Mt19937ar.vimspec
index 091916663..58eeb2b3e 100644
--- a/test/Random/Mt19937ar.vimspec
+++ b/test/Random/Mt19937ar.vimspec
@@ -1,6 +1,6 @@
 Describe Random.Mt19937ar
   Before all
-    let M = vital#of('vital').import('Random.Mt19937ar')
+    let M = vital#vital#new().import('Random.Mt19937ar')
   End
 
   After all
diff --git a/test/Random/Xor128.vimspec b/test/Random/Xor128.vimspec
index 44ff34011..51a18c9ce 100644
--- a/test/Random/Xor128.vimspec
+++ b/test/Random/Xor128.vimspec
@@ -1,6 +1,6 @@
 Describe Random.Xor128
   Before all
-    let X = vital#of('vital').import('Random.Xor128')
+    let X = vital#vital#new().import('Random.Xor128')
   End
 
   Describe .rand()
diff --git a/test/System/Cache.vimspec b/test/System/Cache.vimspec
index e6bfc9a00..8fac837b1 100644
--- a/test/System/Cache.vimspec
+++ b/test/System/Cache.vimspec
@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:F = s:V.import('System.File')
 
 Describe System.Cache
diff --git a/test/System/Cache/Base.vimspec b/test/System/Cache/Base.vimspec
index 2cd4b50ad..81b461b4e 100644
--- a/test/System/Cache/Base.vimspec
+++ b/test/System/Cache/Base.vimspec
@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 
 Describe System.Cache.Base
   let s:C = s:V.import('System.Cache.Base')
diff --git a/test/System/Cache/Dummy.vimspec b/test/System/Cache/Dummy.vimspec
index b1f7da63f..b7f3cfb9a 100644
--- a/test/System/Cache/Dummy.vimspec
+++ b/test/System/Cache/Dummy.vimspec
@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 
 Describe System.Cache.Dummy
   let s:C = s:V.import('System.Cache.Dummy')
diff --git a/test/System/Cache/File.vimspec b/test/System/Cache/File.vimspec
index 8df8142df..8a1af7834 100644
--- a/test/System/Cache/File.vimspec
+++ b/test/System/Cache/File.vimspec
@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:F = s:V.import('System.File')
 let s:P = s:V.import('System.Filepath')
 
diff --git a/test/System/Cache/Memory.vimspec b/test/System/Cache/Memory.vimspec
index ffe620899..b09588c03 100644
--- a/test/System/Cache/Memory.vimspec
+++ b/test/System/Cache/Memory.vimspec
@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 
 Describe System.Cache.Memory
   let s:C = s:V.import('System.Cache.Memory')
diff --git a/test/System/Cache/SingleFile.vimspec b/test/System/Cache/SingleFile.vimspec
index 0f52ae2b2..19ed95d7c 100644
--- a/test/System/Cache/SingleFile.vimspec
+++ b/test/System/Cache/SingleFile.vimspec
@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:F = s:V.import('System.File')
 let s:P = s:V.import('System.Filepath')
 
diff --git a/test/System/Filepath.vimspec b/test/System/Filepath.vimspec
index 612ca6f32..18abf148b 100644
--- a/test/System/Filepath.vimspec
+++ b/test/System/Filepath.vimspec
@@ -1,4 +1,4 @@
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:is_windows = has('win16') || has('win32') || has('win64') || has('win95')
 
 Describe System.Filepath
diff --git a/test/System/Process.vimspec b/test/System/Process.vimspec
index 320500946..cb6e8b074 100644
--- a/test/System/Process.vimspec
+++ b/test/System/Process.vimspec
@@ -1,6 +1,6 @@
 scriptencoding utf-8
 
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:Prelude = s:V.import('Prelude')
 let s:Path = s:V.import('System.Filepath')
 let s:Guard = s:V.import('Vim.Guard')
diff --git a/test/System/Process/Mock.vimspec b/test/System/Process/Mock.vimspec
index e8c7992e0..10f43c8f4 100644
--- a/test/System/Process/Mock.vimspec
+++ b/test/System/Process/Mock.vimspec
@@ -1,4 +1,4 @@
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 
 Describe System.Process.Mock
   Before
diff --git a/test/System/Process/System.vimspec b/test/System/Process/System.vimspec
index 89611867d..5d5bb0aaf 100644
--- a/test/System/Process/System.vimspec
+++ b/test/System/Process/System.vimspec
@@ -1,6 +1,6 @@
 scriptencoding utf-8
 
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:Prelude = s:V.import('Prelude')
 let s:Path = s:V.import('System.Filepath')
 let s:testdata = './test/_testdata/System/Process/'
diff --git a/test/System/Process/Vimproc.vimspec b/test/System/Process/Vimproc.vimspec
index d81d9a081..4be831550 100644
--- a/test/System/Process/Vimproc.vimspec
+++ b/test/System/Process/Vimproc.vimspec
@@ -1,6 +1,6 @@
 scriptencoding utf-8
 
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:Prelude = s:V.import('Prelude')
 let s:Path = s:V.import('System.Filepath')
 let s:ProcessVimproc = s:V.import('System.Process.Vimproc')
diff --git a/test/Text/CSV.vimspec b/test/Text/CSV.vimspec
index 9e1db6c45..e2bd6fde6 100644
--- a/test/Text/CSV.vimspec
+++ b/test/Text/CSV.vimspec
@@ -1,7 +1,7 @@
 
 Describe Text.CSV
   Before all
-    let CSV = vital#of('vital').import('Text.CSV')
+    let CSV = vital#vital#new().import('Text.CSV')
     let testdata_dir = expand('<sfile>:p:h') . '/test/_testdata/Text/CSV'
     let sample_file_in = testdata_dir . '/csv-sample-in.txt'
     let sample_file_out = testdata_dir . '/csv-sample-out.txt'
diff --git a/test/Text/INI.vimspec b/test/Text/INI.vimspec
index 3fe0c3c65..c82552c82 100644
--- a/test/Text/INI.vimspec
+++ b/test/Text/INI.vimspec
@@ -1,4 +1,4 @@
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 call s:V.unload()
 let s:I = s:V.import('Text.INI')
 let s:P = s:V.import('System.Filepath')
diff --git a/test/Text/LTSV.vimspec b/test/Text/LTSV.vimspec
index 7476cc94f..abb3ffe56 100644
--- a/test/Text/LTSV.vimspec
+++ b/test/Text/LTSV.vimspec
@@ -1,6 +1,6 @@
 Describe Text.LTSV
   Before all
-    let LTSV = vital#of('vital').import('Text.LTSV')
+    let LTSV = vital#vital#new().import('Text.LTSV')
     let sample_file = g:root . '/test/_testdata/Text/LTSV/sample.ltsv'
     let expect_data = [
     \   {'name': 'Web.HTTP', 'maintainer': 'mattn'},
diff --git a/test/Text/Lexer.vimspec b/test/Text/Lexer.vimspec
index 176ffe799..3eade8e04 100644
--- a/test/Text/Lexer.vimspec
+++ b/test/Text/Lexer.vimspec
@@ -1,7 +1,7 @@
 
 Describe Text.Lexer
   Before all
-    let Lexer = vital#of('vital').import('Text.Lexer')
+    let Lexer = vital#vital#new().import('Text.Lexer')
     let patterns = [
     \ ['WHITE_SPACES','\s\+'],
     \ ['WORD','[a-zA-Z]\+'],
diff --git a/test/Text/Sexp.vim b/test/Text/Sexp.vim
index 73b1ceb7c..16a887d56 100644
--- a/test/Text/Sexp.vim
+++ b/test/Text/Sexp.vim
@@ -4,7 +4,7 @@ let s:suite = themis#suite('Text.Sexp')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:S = vital#of('vital').import('Text.Sexp')
+  let s:S = vital#vital#new().import('Text.Sexp')
 endfunction
 
 function! s:suite.after()
diff --git a/test/Text/TOML.vim b/test/Text/TOML.vim
index 1141d539f..7de670d50 100644
--- a/test/Text/TOML.vim
+++ b/test/Text/TOML.vim
@@ -2,7 +2,7 @@ let s:suite = themis#suite('Text.TOML')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:TOML = vital#of('vital').import('Text.TOML')
+  let s:TOML = vital#vital#new().import('Text.TOML')
 endfunction
 
 function! s:suite.after()
diff --git a/test/Text/Table.vim b/test/Text/Table.vim
index 1e7f2f320..3d430ca9f 100644
--- a/test/Text/Table.vim
+++ b/test/Text/Table.vim
@@ -4,7 +4,7 @@ let s:suite = themis#suite('Text.Table')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before() abort
-    let s:T = vital#of('vital').import('Text.Table')
+    let s:T = vital#vital#new().import('Text.Table')
 endfunction
 
 function! s:suite.after() abort
diff --git a/test/Vim/Buffer.vimspec b/test/Vim/Buffer.vimspec
index 50184ecb2..12c5a972e 100644
--- a/test/Vim/Buffer.vimspec
+++ b/test/Vim/Buffer.vimspec
@@ -1,6 +1,6 @@
 scriptencoding utf-8
 
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:P = s:V.import('System.Filepath')
 let s:G = s:V.import('Vim.Guard')
 
diff --git a/test/Vim/Compat.vimspec b/test/Vim/Compat.vimspec
index 41797e7fb..a617ca192 100644
--- a/test/Vim/Compat.vimspec
+++ b/test/Vim/Compat.vimspec
@@ -1,7 +1,7 @@
 
 Describe Vim.Compat
   Before all
-    let Compat = vital#of('vital').import('Vim.Compat')
+    let Compat = vital#vital#new().import('Vim.Compat')
   End
 
   Describe .has_version()
diff --git a/test/Vim/Guard.vimspec b/test/Vim/Guard.vimspec
index f99a697ab..aafd3ec3d 100644
--- a/test/Vim/Guard.vimspec
+++ b/test/Vim/Guard.vimspec
@@ -1,4 +1,4 @@
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:P = s:V.import('System.Filepath')
 let s:S = s:V.import('Vim.ScriptLocal')
 let s:is_windows = has('win16') || has('win32') || has('win64')
diff --git a/test/Vim/Message.vimspec b/test/Vim/Message.vimspec
index 699d06999..90baf0655 100644
--- a/test/Vim/Message.vimspec
+++ b/test/Vim/Message.vimspec
@@ -2,7 +2,7 @@ scriptencoding utf-8
 
 Describe Vim.Message
   Before all
-    let Message = vital#of('vital').import('Vim.Message')
+    let Message = vital#vital#new().import('Vim.Message')
   End
 
   Describe .error()
diff --git a/test/Vim/Python.vimspec b/test/Vim/Python.vimspec
index 4593d521e..62b3712d8 100644
--- a/test/Vim/Python.vimspec
+++ b/test/Vim/Python.vimspec
@@ -1,11 +1,11 @@
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:P = s:V.import('Vim.Python')
 let s:is_python2_enabled = s:P.is_python2_enabled()
 let s:is_python3_enabled = s:P.is_python3_enabled()
 
 Describe Vim.Python
   Before all
-    let V = vital#of('vital')
+    let V = vital#vital#new()
     let S = V.import('Vim.ScriptLocal')
     let P = V.import('System.Filepath')
     let Python = V.import('Vim.Python')
diff --git a/test/Vim/ScriptLocal.vimspec b/test/Vim/ScriptLocal.vimspec
index bb61586bd..acd18453a 100644
--- a/test/Vim/ScriptLocal.vimspec
+++ b/test/Vim/ScriptLocal.vimspec
@@ -1,7 +1,7 @@
 Describe Vim.ScriptLocal
 
   Before all
-    let V = vital#of('vital')
+    let V = vital#vital#new()
     let P = V.import('Prelude')
     let S = V.import('Vim.ScriptLocal')
   End
diff --git a/test/Vim/Search.vimspec b/test/Vim/Search.vimspec
index c2b43244c..14a6f4a76 100644
--- a/test/Vim/Search.vimspec
+++ b/test/Vim/Search.vimspec
@@ -1,7 +1,7 @@
 
 Describe Vim.Search
   Before all
-    let Search = vital#of('vital').import('Vim.Search')
+    let Search = vital#vital#new().import('Vim.Search')
   End
 
   Context .finddef()
diff --git a/test/Vim/ViewTracer.vimspec b/test/Vim/ViewTracer.vimspec
index 668a70aff..edd93dc61 100644
--- a/test/Vim/ViewTracer.vimspec
+++ b/test/Vim/ViewTracer.vimspec
@@ -6,7 +6,7 @@ endfunction
 Describe Vim.ViewTracer
 
   Before all
-    let T = vital#of('vital').import('Vim.ViewTracer')
+    let T = vital#vital#new().import('Vim.ViewTracer')
   End
 
   Before
diff --git a/test/Web/HTTP.vimspec b/test/Web/HTTP.vimspec
index 9526e7840..eec30375f 100644
--- a/test/Web/HTTP.vimspec
+++ b/test/Web/HTTP.vimspec
@@ -2,7 +2,7 @@ scriptencoding utf-8
 
 Describe Web.HTTP
   Before all
-    let HTTP = vital#of('vital').import('Web.HTTP')
+    let HTTP = vital#vital#new().import('Web.HTTP')
   End
 
   Describe .encodeURI()
diff --git a/test/Web/HTTP/Cookie.vimspec b/test/Web/HTTP/Cookie.vimspec
index aedfac56f..e51adae79 100644
--- a/test/Web/HTTP/Cookie.vimspec
+++ b/test/Web/HTTP/Cookie.vimspec
@@ -2,8 +2,8 @@ scriptencoding utf-8
 
 Describe Web.HTTP.Cookie
   Before all
-    let Cookie = vital#of('vital').import('Web.HTTP.Cookie')
-    let DateTime = vital#of('vital').import('DateTime')
+    let Cookie = vital#vital#new().import('Web.HTTP.Cookie')
+    let DateTime = vital#vital#new().import('DateTime')
   End
 
   Describe .new()
diff --git a/test/Web/HTTP/CookieJar.vimspec b/test/Web/HTTP/CookieJar.vimspec
index 73de80da5..08b54f139 100644
--- a/test/Web/HTTP/CookieJar.vimspec
+++ b/test/Web/HTTP/CookieJar.vimspec
@@ -2,9 +2,9 @@ scriptencoding utf-8
 
 Describe Web.HTTP.CookieJar
   Before all
-    let Cookie = vital#of('vital').import('Web.HTTP.Cookie')
-    let Jar = vital#of('vital').import('Web.HTTP.CookieJar')
-    let DateTime = vital#of('vital').import('DateTime')
+    let Cookie = vital#vital#new().import('Web.HTTP.Cookie')
+    let Jar = vital#vital#new().import('Web.HTTP.CookieJar')
+    let DateTime = vital#vital#new().import('DateTime')
   End
 
   Describe .new()
diff --git a/test/Web/JSON.vimspec b/test/Web/JSON.vimspec
index 9af3a8cde..b99c85d33 100644
--- a/test/Web/JSON.vimspec
+++ b/test/Web/JSON.vimspec
@@ -1,6 +1,6 @@
 Describe Web.JSON
   Before all
-    let JSON = vital#of('vital').import('Web.JSON')
+    let JSON = vital#vital#new().import('Web.JSON')
   End
 
   Describe .constants()
diff --git a/test/Web/URI.vimspec b/test/Web/URI.vimspec
index 8f2408ea8..38aefd5ba 100644
--- a/test/Web/URI.vimspec
+++ b/test/Web/URI.vimspec
@@ -2,7 +2,7 @@ scriptencoding utf-8
 
 Describe Web.URI
   Before all
-    let URI = vital#of('vital').import('Web.URI')
+    let URI = vital#vital#new().import('Web.URI')
   End
 
   Describe .new()
diff --git a/test/vital.vimspec b/test/vital.vimspec
index e69e5bcef..cde46a5b4 100644
--- a/test/vital.vimspec
+++ b/test/vital.vimspec
@@ -11,7 +11,7 @@ endif
 Describe vital
 
   Before all
-    let Vital = vital#vital#of()
+    let Vital = vital#vital#new()
     let File = Vital.import('System.File')
     let Filepath = Vital.import('System.Filepath')
     let Prelude = Vital.import('Prelude')
@@ -57,7 +57,7 @@ Describe vital
           Skip "windows doesn't handle symlink"
         endif
         call vitalizer#vitalize('symlink', g:symlinkplugin_root, vitalize_modules, '')
-        let V = vital#symlink#of()
+        let V = vital#symlink#new()
         Assert True(V.import('Selfmodule').return1())
         let List = V.import('Data.List')
         Assert Equals(List.uniq([1, 1, 2, 3, 1]), [1, 2, 3])
@@ -119,7 +119,7 @@ Describe vital
 
     Context {plugin-name} is vital
       Before all
-        let V = vital#of('vital')
+        let V = vital#vital#new()
       End
 
       It creates a vital object which supports available modules
@@ -141,7 +141,7 @@ Describe vital
     Context wildignore handling
       Before all
         set wildignore+=*.vim,*.vital
-        call vital#{g:testplugin_name}#of().unload()
+        call vital#{g:testplugin_name}#new().unload()
       End
 
       After all
@@ -157,20 +157,20 @@ Describe vital
 
   End
 
-  Describe vital#{plugin-name}#of()
+  Describe vital#{plugin-name}#new()
     It creates a vital object
-      let V = vital#{g:testplugin_name}#of()
+      let V = vital#{g:testplugin_name}#new()
       Assert Equals(type(V), type({}))
       Assert HasKey(V, 'import')
     End
 
     Context {plugin-name} is vital
       Before all
-        let V = vital#vital#of()
+        let V = vital#vital#new()
       End
 
       It creates a vital object
-        let V = vital#vital#of()
+        let V = vital#vital#new()
         Assert Equals(type(V), type({}))
         Assert HasKey(V, 'import')
       End
@@ -186,7 +186,7 @@ Describe vital
       End
 
       It handles &wildignore
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Assert Equals(type(V), type({}))
         Assert HasKey(V, 'import')
       End
@@ -240,7 +240,7 @@ Describe vital
     Context wildignore handling
       Before all
         set wildignore+=*.vim
-        call vital#{g:testplugin_name}#of().unload()
+        call vital#{g:testplugin_name}#new().unload()
       End
 
       After all
@@ -262,7 +262,7 @@ Describe vital
 
   Describe vital-Vital-object
     Before all
-      let V = vital#{g:testplugin_name}#of()
+      let V = vital#{g:testplugin_name}#new()
     End
 
     Describe .import
@@ -298,7 +298,7 @@ Describe vital
       Context wildignore handling
         Before all
           set wildignore+=*.vim
-          call vital#{g:testplugin_name}#of().unload()
+          call vital#{g:testplugin_name}#new().unload()
         End
 
         After all
@@ -306,12 +306,12 @@ Describe vital
         End
 
         It can handle wildignore (embedded module)
-          let List = vital#{g:testplugin_name}#of().import('Data.List')
+          let List = vital#{g:testplugin_name}#new().import('Data.List')
           Assert Equals(List.uniq([1, 1, 2, 3, 1]), [1, 2, 3])
         End
 
         It can handle wildignore (self module)
-          let Selfmodule = vital#{g:testplugin_name}#of().import('Selfmodule')
+          let Selfmodule = vital#{g:testplugin_name}#new().import('Selfmodule')
           Assert True(Selfmodule.return1())
         End
 
@@ -324,7 +324,7 @@ Describe vital
 
       Context {plugin-name} is vital
         Before all
-          let V = vital#vital#of()
+          let V = vital#vital#new()
         End
 
         It supports all available modules in &runtimepath
@@ -337,25 +337,25 @@ Describe vital
 
     Describe .load
       It imports a basic vital module
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Assert Equals(V.load('Data.List'), V)
         Assert Equals(V.Data.List.uniq([1, 1, 2, 3, 1]), [1, 2, 3])
       End
 
       It supports s:_vital_loaded(V)
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Assert Equals(V.load('Web.JSON'), V)
         Assert Equals(V.Web.JSON.decode('[1, "ni"]'), [1, "ni"])
       End
 
       It supports s:_vital_created(V)
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Assert Equals(V.load('Web.JSON'), V)
         Assert HasKey(V.Web.JSON, 'true')
       End
 
       It supports self module
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Assert Equals(V.load('Selfmodule'), V)
         Assert True(V.Selfmodule.return1())
       End
@@ -365,7 +365,7 @@ Describe vital
       End
 
       It supports cyclic dependencies
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Assert Equals(V.load('Cyclic1'), V)
         Assert True(V.Cyclic1.return1())
       End
@@ -373,7 +373,7 @@ Describe vital
       Context wildignore handling
         Before all
           set wildignore+=*.vim
-          call vital#{g:testplugin_name}#of().unload()
+          call vital#{g:testplugin_name}#new().unload()
         End
 
         After all
@@ -381,12 +381,12 @@ Describe vital
         End
 
         It can handle wildignore (embedded module)
-          let V = vital#{g:testplugin_name}#of().load('Data.List')
+          let V = vital#{g:testplugin_name}#new().load('Data.List')
           Assert Equals(V.Data.List.uniq([1, 1, 2, 3, 1]), [1, 2, 3])
         End
 
         It can handle wildignore (self module)
-          let V = vital#{g:testplugin_name}#of().load('Selfmodule')
+          let V = vital#{g:testplugin_name}#new().load('Selfmodule')
           Assert True(V.Selfmodule.return1())
         End
 
@@ -399,7 +399,7 @@ Describe vital
 
       Context {plugin-name} is vital
         Before all
-          let V = vital#vital#of()
+          let V = vital#vital#new()
         End
 
         It supports all available modules in &runtimepath
@@ -412,29 +412,29 @@ Describe vital
 
     Describe .exists()
       It returns 1 for existing module
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Assert True(V.exists('Data.List'))
       End
 
       It returns 1 for existing which didn't be sorced yet
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Assert True(V.exists('Data.LazyList'))
       End
 
       It returns 0 for non-existing module
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Assert False(V.exists('Not.Exists'))
       End
 
       It throws error for invalid module name
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
         Throws /vital: Invalid module name: not-exists/ :call V.exists('not-exists')
       End
 
       Context wildignore handling
         Before all
           set wildignore+=*.vim
-          call vital#{g:testplugin_name}#of().unload()
+          call vital#{g:testplugin_name}#new().unload()
         End
 
         After all
@@ -442,11 +442,11 @@ Describe vital
         End
 
         It can handle wildignore (embedded module)
-          Assert True(vital#{g:testplugin_name}#of().exists('Data.List'))
+          Assert True(vital#{g:testplugin_name}#new().exists('Data.List'))
         End
 
         It can handle wildignore (self module)
-          Assert True(vital#{g:testplugin_name}#of().exists('Selfmodule'))
+          Assert True(vital#{g:testplugin_name}#new().exists('Selfmodule'))
         End
 
         It can handle wildignore (vital)
@@ -457,7 +457,7 @@ Describe vital
 
       Context {plugin-name} is vital
         Before all
-          let V = vital#vital#of()
+          let V = vital#vital#new()
         End
 
         It supports all available modules in &runtimepath
@@ -470,7 +470,7 @@ Describe vital
 
     Describe .search()
       Before all
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
       End
 
       It searches existing module
@@ -493,7 +493,7 @@ Describe vital
       Context wildignore handling
         Before all
           set wildignore+=*.vim
-          call vital#{g:testplugin_name}#of().unload()
+          call vital#{g:testplugin_name}#new().unload()
         End
 
         After all
@@ -501,11 +501,11 @@ Describe vital
         End
 
         It can handle wildignore (embedded module)
-          Assert NotEmpty(vital#{g:testplugin_name}#of().search('Data.List'))
+          Assert NotEmpty(vital#{g:testplugin_name}#new().search('Data.List'))
         End
 
         It can handle wildignore (self module)
-          Assert NotEmpty(vital#{g:testplugin_name}#of().search('Selfmodule'))
+          Assert NotEmpty(vital#{g:testplugin_name}#new().search('Selfmodule'))
         End
 
         It can handle wildignore (vital)
@@ -516,7 +516,7 @@ Describe vital
 
       Context {plugin-name} is vital
         Before all
-          let V = vital#vital#of()
+          let V = vital#vital#new()
         End
 
         It supports available modules in &runtimepath
@@ -529,7 +529,7 @@ Describe vital
 
     Describe .plugin_name()
       Before all
-        let V = vital#{g:testplugin_name}#of()
+        let V = vital#{g:testplugin_name}#new()
       End
 
       It returns plugin name
@@ -538,7 +538,7 @@ Describe vital
 
       Context {plugin-name} is vital
         Before all
-          let V = vital#of('vital')
+          let V = vital#vital#new()
         End
 
         It returns vital for "vital"