Even more method name cleanup.