the names will change to be more descriptive. I left them the same for now to change fewer things at once.