In this situation, I personally would revert everything back to how it was before altering template folder names.
So rename the new template to its original name.
Then rename your original custom template back to just that, i.e. custom