added self rename