renamed variables to have similar names in different files (later this would help me to modify it with sed)
Merge branch 'master' of git://github.com/CYB3Rhuman/kicad-cyb-mod