update readme and minor naming changes