Stricter patter for new project name + accumulated code cleanups

TBR

Partially addresses #1970.