update readme and naming conventions