KDP cleanup n of m

More re-factoring and consistent naming.