kg_machinecategory_* to kg_machine_category_*

Change-Id: I7c68da649582ed4b982a485b43d43a4b66b5ab6f
kg_software* to kg_software_*

Change-Id: Ia263e14064fcd7276fa4ec036ff86a29c2397460
Fix broken updates.

dc4491be9b701ae80227fa6066bdcfe5bed8f1ae broken, updated stuff it
shouldn't have.

Change-Id: I6d1ca3b510cef938fba1435e6a153527ac2f0f5e