Documentation updated. Names make a bit more sense.