Re-rename after bugfix.