The naming may be different (right now), but they are the same conceptually from what it sounds like. We should just converge on a single convention and adjust our code accordingly.