mock deleted and little renaming