Changed tipnames (still issues)