changed names to uppercase stuff