New York scraps word ‘inmate’ in state law