Slightly better names.