If we stick to just one naming convention, this can probably disappear entirely.