Slightly more sensible names and types