Updated readme, a couple of name changes