and use better names