[sr-dev] git:master: Fixing typos, changing names