diff --git a/d2core/d2hero/hero_state_factory.go b/d2core/d2hero/hero_state_factory.go
index 43ba461e..10ad1bd2 100644
--- a/d2core/d2hero/hero_state_factory.go
+++ b/d2core/d2hero/hero_state_factory.go
@@ -110,7 +110,7 @@ func (f *HeroStateFactory) GetAllHeroStates() ([]*HeroState, error) {
 }
 
 // CreateHeroSkillsState will assemble the hero skills from the class stats record.
-func (f *HeroStateFactory) CreateHeroSkillsState(classStats *d2records.CharStatsRecord, heroType d2enum.Hero) (map[int]*HeroSkill, error) {
+func (f *HeroStateFactory) CreateHeroSkillsState(classStats *d2records.CharStatRecord, heroType d2enum.Hero) (map[int]*HeroSkill, error) {
 	baseSkills := map[int]*HeroSkill{}
 
 	for idx := range classStats.BaseSkill {
diff --git a/d2core/d2hero/hero_stats_state.go b/d2core/d2hero/hero_stats_state.go
index 96400b2f..4a3f1e99 100644
--- a/d2core/d2hero/hero_stats_state.go
+++ b/d2core/d2hero/hero_stats_state.go
@@ -30,7 +30,7 @@ type HeroStatsState struct {
 }
 
 // CreateHeroStatsState generates a running state from a hero stats.
-func (f *HeroStateFactory) CreateHeroStatsState(heroClass d2enum.Hero, classStats *d2records.CharStatsRecord) *HeroStatsState {
+func (f *HeroStateFactory) CreateHeroStatsState(heroClass d2enum.Hero, classStats *d2records.CharStatRecord) *HeroStatsState {
 	result := HeroStatsState{
 		Level:        1,
 		Experience:   0,
diff --git a/d2core/d2item/diablo2item/item_property_test.go b/d2core/d2item/diablo2item/item_property_test.go
index ec932ff5..30c1d5b4 100644
--- a/d2core/d2item/diablo2item/item_property_test.go
+++ b/d2core/d2item/diablo2item/item_property_test.go
@@ -277,7 +277,7 @@ var itemStatCosts = map[string]*d2records.ItemStatCostRecord{
 }
 
 // nolint:gochecknoglobals // just a test
-var charStats = map[d2enum.Hero]*d2records.CharStatsRecord{
+var charStats = map[d2enum.Hero]*d2records.CharStatRecord{
 	d2enum.HeroPaladin: {
 		Class:             d2enum.HeroPaladin,
 		SkillStrAll:       "to Paladin Skill Levels",
diff --git a/d2core/d2records/charstats_loader.go b/d2core/d2records/charstats_loader.go
index 2fd0b78f..86f1d30a 100644
--- a/d2core/d2records/charstats_loader.go
+++ b/d2core/d2records/charstats_loader.go
@@ -38,7 +38,7 @@ func charStatsLoader(r *RecordManager, d *d2txt.DataDictionary) error {
 	}
 
 	for d.Next() {
-		record := &CharStatsRecord{
+		record := &CharStatRecord{
 			Class: stringMap[d.String("class")],
 
 			InitStr:     d.Number("str"),
diff --git a/d2core/d2records/charstats_record.go b/d2core/d2records/charstats_record.go
index 5d7bd35d..c7717ac1 100644
--- a/d2core/d2records/charstats_record.go
+++ b/d2core/d2records/charstats_record.go
@@ -2,11 +2,11 @@ package d2records
 
 import "github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
 
-// CharStats holds all of the CharStatsRecords
-type CharStats map[d2enum.Hero]*CharStatsRecord
+// CharStats holds all of the CharStatRecords
+type CharStats map[d2enum.Hero]*CharStatRecord
 
-// CharStatsRecord is a struct that represents a single row from charstats.txt
-type CharStatsRecord struct {
+// CharStatRecord is a struct that represents a single row from charstats.txt
+type CharStatRecord struct {
 	Class d2enum.Hero
 
 	// the initial stats at character level 1
diff --git a/d2core/d2stats/diablo2stats/stat_test.go b/d2core/d2stats/diablo2stats/stat_test.go
index cd54927c..e6ae66e2 100644
--- a/d2core/d2stats/diablo2stats/stat_test.go
+++ b/d2core/d2stats/diablo2stats/stat_test.go
@@ -238,12 +238,12 @@ var skillDetails = map[int]*d2records.SkillRecord{
 }
 
 // nolint:gochecknoglobals // just a test
-var monStats = map[string]*d2records.MonStatsRecord{
+var monStats = map[string]*d2records.MonStatRecord{
 	"Specter": {NameString: "Specter", ID: 40},
 }
 
 // nolint:gochecknoglobals // just a test
-var charStats = map[d2enum.Hero]*d2records.CharStatsRecord{
+var charStats = map[d2enum.Hero]*d2records.CharStatRecord{
 	d2enum.HeroPaladin: {
 		Class:             d2enum.HeroPaladin,
 		SkillStrAll:       "to Paladin Skill Levels",