Yes. OTOH the new program is a fresh start and will go on much longer than Apollo, Surveyer, Ranger. The technology will be all new, especially robotics. Much more will be done, and the work will build toward Mars.
IF, IN FACT, We Landed on the Moon, & GOT ALL THE DATA we SHOULD HAVE, --there is NO NEED for a "Long, Scientific Run-up to a "Moon Landing!!"
WHY the BIG "PRELUDE??"
UNLESS the "Conspirathy Theorists" were Correct, there is NO REASON for a Long, Protracted "Run-Up" to a new Moon Landing!!
WHAT is the PROBLEM??
The Amount of "Run-up" is SO extensive, that SOME of us are Beginning to Wonder if the "Hollywood Sound Stage Types" MIGHT "Have a Point!!"
If We're Going Back to the Moon--Let's JUST DO IT!!
Doc