had a bunch of constants set up for field names but apparently never got around to using them in-code, this switches over to them wherever possible