Let's be consistent in our directory naming, shall we?