Fix bug for old name