DATAREST-323: Fix typos and remove a duplicated word