fixed some name changes