Finally changed all names to lower case