diff --git a/util/btcmath.go b/util/math.go
similarity index 100%
rename from util/btcmath.go
rename to util/math.go
diff --git a/util/btcmath_test.go b/util/math_test.go
similarity index 100%
rename from util/btcmath_test.go
rename to util/math_test.go
diff --git a/util/btcstrings.go b/util/strings.go
similarity index 100%
rename from util/btcstrings.go
rename to util/strings.go
diff --git a/util/btcstrings_test.go b/util/strings_test.go
similarity index 100%
rename from util/btcstrings_test.go
rename to util/strings_test.go
diff --git a/util/btcutil.go b/util/util.go
similarity index 100%
rename from util/btcutil.go
rename to util/util.go