Change URI naming and fix a few issues