Fixup the directory name at a higher level so it can be used by both conditional branches

Fixes #500