Refactor some leftover legacy naming conventions...