Some sensible naming changes, shouldn't break anything