Renaming stuff to clarify usage