Port filename fix from connectionpool branch