diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
index eee3467..3ec797e 100644
--- a/builder/frameworks/espidf.py
+++ b/builder/frameworks/espidf.py
@@ -447,7 +447,7 @@ def generate_project_ld_script(target, source, env):
         "sections": source[0].get_path(),
         "input": join(
             FRAMEWORK_DIR, "components", "esp32", "ld", "esp32.project.ld.in"),
-        "sdk_header": join(env.subst("$PROJECTSRC_DIR"), "sdkconfig.h"),
+        "sdk_header": join(env.subst("$PROJECT_SRC_DIR"), "sdkconfig.h"),
         "fragments": " ".join(
             ["\"%s\"" % f for f in project_files.get("lf_files")]),
         "output": target[0].get_path(),
@@ -591,7 +591,7 @@ env.Prepend(
         join(FRAMEWORK_DIR, "components", "lwip", "port", "esp32", "include"),
         join(FRAMEWORK_DIR, "components", "lwip", "port", "esp32", "include", "arch"),
         join(FRAMEWORK_DIR, "components", "include_compat"),
-        join("$PROJECTSRC_DIR"),
+        join("$PROJECT_SRC_DIR"),
         join(FRAMEWORK_DIR, "components", "mbedtls", "port", "include"),
         join(FRAMEWORK_DIR, "components", "mbedtls", "mbedtls", "include"),
         join(FRAMEWORK_DIR, "components", "mdns", "include"),
@@ -719,7 +719,7 @@ env.Replace(ASFLAGS=[])
 
 
 def process_project_configs(filename):
-    config = join(env.subst("$PROJECTSRC_DIR"), filename)
+    config = join(env.subst("$PROJECT_SRC_DIR"), filename)
     if not isfile(config):
         print("Warning! Cannot find %s file. Default "
               "file will be added to your project!" % filename)
@@ -738,15 +738,15 @@ def process_project_configs(filename):
 
             new_config = find_valid_example_file(filename)
             copy(config, join(
-                env.subst("$PROJECTSRC_DIR"), "%s.bak" % filename))
+                env.subst("$PROJECT_SRC_DIR"), "%s.bak" % filename))
             copy(new_config, config)
 
 
 process_project_configs("sdkconfig")
-sdk_config = join(env.subst("$PROJECTSRC_DIR"), "sdkconfig")
+sdk_config = join(env.subst("$PROJECT_SRC_DIR"), "sdkconfig")
 
 process_project_configs("sdkconfig.h")
-sdk_config_header = join(env.subst("$PROJECTSRC_DIR"), "sdkconfig.h")
+sdk_config_header = join(env.subst("$PROJECT_SRC_DIR"), "sdkconfig.h")
 sdk_params = get_sdk_configuration(sdk_config_header)
 
 configure_exceptions(sdk_params)
@@ -783,7 +783,7 @@ linker_script = env.Command(
     join("$BUILD_DIR", "esp32_out.ld"),
     join(FRAMEWORK_DIR, "components", "esp32", "ld", "esp32.ld"),
     env.VerboseAction(
-        '$CC -I"$PROJECTSRC_DIR" -C -P -x  c -E $SOURCE -o $TARGET',
+        '$CC -I"$PROJECT_SRC_DIR" -C -P -x  c -E $SOURCE -o $TARGET',
         "Generating LD script $TARGET"))
 
 env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", linker_script)
diff --git a/builder/frameworks/ulp.py b/builder/frameworks/ulp.py
index fcd3b7d..bfd3252 100644
--- a/builder/frameworks/ulp.py
+++ b/builder/frameworks/ulp.py
@@ -56,7 +56,7 @@ def bin_converter(target, source, env):
 
 
 ulp_env.Append(
-    CPPPATH=["$PROJECTSRC_DIR"],
+    CPPPATH=["$PROJECT_SRC_DIR"],
 
     BUILDERS=dict(
         BuildElf=Builder(
@@ -114,7 +114,7 @@ def preprocess_ld_script():
                  "-DWITH_POSIX", "-D__ASSEMBLER__",
                  '-DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h"',
                  "-DHAVE_CONFIG_H", "-MT", "$TARGET", "-E", "-P", "-xc", "-o",
-                 "$TARGET", "-I $PROJECTSRC_DIR", "$SOURCE")
+                 "$TARGET", "-I $PROJECT_SRC_DIR", "$SOURCE")
 
     return ulp_env.Command(
         join(ULP_BUILD_DIR, "ulp_main.common.ld"),