rename
reformat
remove plural