Renaming stuff to make this area a bit clearer.