DBServer: Use consitent folder naming scheme