Now that we have made these all public, should we convert them to enums and put them in a separate file (in another PR)?