ADDS codom usage data; FIXES naming convensions