Tighten args and change some function names.