(Issue 579) Cleaning up use of constants for search document mapping names