Some renaming, added parameter annotation
Merge branch 'master' of https://github.com/Blazebit/blaze-persistence