Modifies documentation and naming for clarity