Updated readme and naming