Using more sensible names.