Switched some things to StringID defines