Corrected some documentation and names