Added more Names to match case problems