changed names around to remove spaces