Cleanup: method naming.