Agreed. I know you pulled this from another package @bburan-galenea, but for us to like it, it will need to conform to our conventions :)