Clarified method names, fixed bug

Per @yulianglukhenko