small naming changes and refactoring to stay in sync with the main guardian app