fixed some name