diff --git a/vndk/snapshot/gen_buildfiles.py b/vndk/snapshot/gen_buildfiles.py
index ce750bcf9..b29e463d5 100644
--- a/vndk/snapshot/gen_buildfiles.py
+++ b/vndk/snapshot/gen_buildfiles.py
@@ -60,7 +60,11 @@ class GenBuildFile(object):
     """
     INDENT = '    '
     ETC_MODULES = [
-        'ld.config.txt', 'llndk.libraries.txt', 'vndksp.libraries.txt'
+        'ld.config.txt',
+        'llndk.libraries.txt',
+        'vndksp.libraries.txt',
+        'vndkcore.libraries.txt',
+        'vndkprivate.libraries.txt'
     ]
 
     def __init__(self, install_dir, vndk_version):
@@ -77,10 +81,12 @@ class GenBuildFile(object):
         self._snapshot_archs = utils.get_snapshot_archs(install_dir)
         self._root_bpfile = os.path.join(install_dir, utils.ROOT_BP_PATH)
         self._common_bpfile = os.path.join(install_dir, utils.COMMON_BP_PATH)
-        self._vndk_core = self._parse_lib_list('vndkcore.libraries.txt')
+        self._vndk_core = self._parse_lib_list(
+            os.path.basename(self._etc_paths['vndkcore.libraries.txt']))
         self._vndk_sp = self._parse_lib_list(
             os.path.basename(self._etc_paths['vndksp.libraries.txt']))
-        self._vndk_private = self._parse_lib_list('vndkprivate.libraries.txt')
+        self._vndk_private = self._parse_lib_list(
+            os.path.basename(self._etc_paths['vndkprivate.libraries.txt']))
         self._modules_with_notice = self._get_modules_with_notice()
 
     def _get_etc_paths(self):
diff --git a/vndk/snapshot/update.py b/vndk/snapshot/update.py
index 2a8441ed9..3c8bb6aa2 100644
--- a/vndk/snapshot/update.py
+++ b/vndk/snapshot/update.py
@@ -151,6 +151,11 @@ def post_processe_files_if_needed(vndk_version):
         for file_to_rename in files_to_add_version_suffix:
             add_version_suffix(file_to_rename)
 
+    files_to_enforce_version_suffix = ('vndkcore.libraries.txt',
+                                       'vndkprivate.libraries.txt')
+    for file_to_rename in files_to_enforce_version_suffix:
+        add_version_suffix(file_to_rename)
+
 
 def update_buildfiles(buildfile_generator):
     logging.info('Generating root Android.bp file...')