Renaming to carrier model ("fx3t")
Renaming some things I missed before
Renaming some things I missed before