Removed case insensitive of the names