refactor: renamed the methods for building claims