changed links and naming