[#2165] Filling in a few more changes of pattern -> path