Fix doc and names

Yes, will do it.