Fixed namespace issues of base directory index