Fix wrong type for sub_id, which would cause overflow grief on
long-running server. Also some related renames for consistency.