NTFY-19: adjust naming for clarification and to fix typos