Added workaround for naming conflict with folders and files