changed naming and improted a pynn thing to match standard spec.
Merge remote-tracking branch 'origin/master'