Minor API changes and fixing a bug

No. The name of the method is picked so that it clarifies this fact and make it self documenting.