changed names to uppercase
changed id names