Small refactor for URL paths and names