Maybe some better names might help?