2.5.2 Rename KM modules to avoid conflict with remaining km_lib. Code Cleanup