Naming changes + README adjustment