Small fixes for URI naming conventions