fixing camelcase issue
fixing camelCase issue 2
added checks to prevent case issues