Fix overzealous clean -p
for reserved names.
#8398
Merged
clean -p
for reserved names.
#8398