Removed trace and renamed