some renaming and some more packaging
consistency naming
I also think all invocations should share naming