Changed some tag names and README file