Minor renaming
Documentation and commenting changes