Tenant forms folder and file names consistent