Updated naming
Refactored uri build