kpv: fix naming/inconsistencies.
Merge branch 'master' of github.com:FlightDataServices/FlightDataAnalyzer