Name and deprecated fix