Improved naming of pages for accessibility (#1127)