I defer to @pwalczysko opinion of whether a rename would help or not.