Change uri naming to quotes everywhere