Fix bug for missing variable as not declared. Fix --generic-names switch as...
Fix bug for missing variable as not declared. Fix --generic-names switch as was not actually a switch. The option was enabled 100% of the time regardless if --generic-names was passed or not