bug fix with the replacement of names.