Maybe adding some yard doc (and filling @parameter and @return) will help to realize that the names are not that good