I went ahead and changed these across the rest of the codebase. :D