diff --git a/openpype/hosts/tvpaint/plugins/load/load_workfile.py b/openpype/hosts/tvpaint/plugins/load/load_workfile.py
index 11219320ca..d224cfc390 100644
--- a/openpype/hosts/tvpaint/plugins/load/load_workfile.py
+++ b/openpype/hosts/tvpaint/plugins/load/load_workfile.py
@@ -1,11 +1,11 @@
-import getpass
 import os
 
 from avalon import api, io
 from openpype.lib import (
+    StringTemplate,
     get_workfile_template_key_from_context,
     get_workdir_data,
-    StringTemplate,
+    get_last_workfile_with_version,
 )
 from openpype.api import Anatomy
 from openpype.hosts.tvpaint.api import lib, pipeline, plugin
@@ -68,7 +68,6 @@ class LoadWorkfile(plugin.Loader):
 
         data = get_workdir_data(project_doc, asset_doc, task_name, host_name)
         data["root"] = anatomy.roots
-        data["user"] = getpass.getuser()
 
         file_template = anatomy.templates[template_key]["file"]
 
@@ -86,7 +85,7 @@ class LoadWorkfile(plugin.Loader):
         work_root = StringTemplate.format_strict_template(
             folder_template, data
         )
-        version = api.last_workfile_with_version(
+        version = get_last_workfile_with_version(
             work_root, file_template, data, host.file_extensions()
         )[1]
 
diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py
index b8502ae718..1ebafbb2d2 100644
--- a/openpype/lib/__init__.py
+++ b/openpype/lib/__init__.py
@@ -114,6 +114,8 @@ from .avalon_context import (
     get_workdir_data,
     get_workdir,
     get_workdir_with_workdir_data,
+    get_last_workfile_with_version,
+    get_last_workfile,
 
     create_workfile_doc,
     save_workfile_data_to_doc,
@@ -263,6 +265,8 @@ __all__ = [
     "get_workdir_data",
     "get_workdir",
     "get_workdir_with_workdir_data",
+    "get_last_workfile_with_version",
+    "get_last_workfile",
 
     "create_workfile_doc",
     "save_workfile_data_to_doc",
diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index ef175ac89a..557c016d74 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -28,7 +28,8 @@ from .local_settings import get_openpype_username
 from .avalon_context import (
     get_workdir_data,
     get_workdir_with_workdir_data,
-    get_workfile_template_key
+    get_workfile_template_key,
+    get_last_workfile
 )
 
 from .python_module_tools import (
@@ -1609,7 +1610,7 @@ def _prepare_last_workfile(data, workdir):
                 "ext": extensions[0]
             })
 
-            last_workfile_path = avalon.api.last_workfile(
+            last_workfile_path = get_last_workfile(
                 workdir, file_template, workdir_data, extensions, True
             )
 
diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py
index da5524331a..713992bc4b 100644
--- a/openpype/tools/workfiles/app.py
+++ b/openpype/tools/workfiles/app.py
@@ -2,7 +2,6 @@ import sys
 import os
 import re
 import copy
-import getpass
 import shutil
 import logging
 import datetime
@@ -27,7 +26,8 @@ from openpype.lib import (
     save_workfile_data_to_doc,
     get_workfile_template_key,
     create_workdir_extra_folders,
-    get_workdir_data
+    get_workdir_data,
+    get_last_workfile_with_version
 )
 from openpype.lib.avalon_context import (
     update_current_task,
@@ -441,7 +441,7 @@ class NameWindow(QtWidgets.QDialog):
 
             data["ext"] = data["ext"][1:]
 
-            version = api.last_workfile_with_version(
+            version = get_last_workfile_with_version(
                 self.root, template, data, extensions
             )[1]
 
@@ -469,7 +469,7 @@ class NameWindow(QtWidgets.QDialog):
                 # Log warning
                 if idx == 0:
                     log.warning((
-                        "BUG: Function `last_workfile_with_version` "
+                        "BUG: Function `get_last_workfile_with_version` "
                         "didn't return last version."
                     ))
             # Raise exception if even 100 version fallback didn't help