Renamed some stuff that wasn't a header but was named as a header