Nit. Can we camel case all of these?