Reorder the README and fix a generic naming from a template file