Method rename, cleanup.