Update names and README