Clean up modal background, be consistent with modal names