Fixing casing so that the big helper method we used to have, which had a case statement for it can be deleted