cache rights, rename helpers, fix convetions