REST simple grammar changes