More consistent parameter names + updated doc strings