Renamed CodeCategory and CodeSubcategory to CodeType and CodeCategory, respectively.