more updates to names and style