diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index 920150a7..1c981d14 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -109,7 +109,7 @@ def clang_base_deps(d):
     return ""
 
 BASE_DEFAULT_DEPS:toolchain-clang:class-target = "${@clang_base_deps(d)}"
-BASE_DEFAULT_DEPS:append:class-native:toolchain-clang_runtime-llvm = " libcxx-native compiler-rt-native"
+BASE_DEFAULT_DEPS:append:class-native:toolchain-clang:runtime-llvm = " libcxx-native compiler-rt-native"
 
 cmake_do_generate_toolchain_file:append:toolchain-clang () {
     cat >> ${WORKDIR}/toolchain.cmake <<EOF
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 9ee3d341..4ce6814f 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -85,7 +85,7 @@ CXXFLAGS:append:armv5 = " -mfpu=vfp2"
 
 ALLOW_EMPTY:${PN} = "1"
 
-PROVIDES:append_runtime-llvm = " libunwind"
+PROVIDES:append:runtime-llvm = " libunwind"
 
 do_install:append() {
     if ${@bb.utils.contains("RUNTIME", "llvm", "true", "false", d)}
@@ -97,8 +97,8 @@ do_install:append() {
     fi
 }
 
-PACKAGES:append_runtime-llvm = " libunwind"
-FILES:libunwind_runtime-llvm = "${libdir}/libunwind.so.*"
+PACKAGES:append:runtime-llvm = " libunwind"
+FILES:libunwind:runtime-llvm = "${libdir}/libunwind.so.*"
 
 BBCLASSEXTEND = "native nativesdk"
 TOOLCHAIN:forcevariable = "clang"
diff --git a/recipes-support/libunwind/libunwind_%.bbappend b/recipes-support/libunwind/libunwind_%.bbappend
index 7dee3e8d..51c3cee2 100644
--- a/recipes-support/libunwind/libunwind_%.bbappend
+++ b/recipes-support/libunwind/libunwind_%.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-COMPATIBLE_HOST_runtime-llvm = "null"
+COMPATIBLE_HOST:runtime-llvm = "null"