[FORWARD PORT] LPS-50874 use the same folder name everywhere