Made changes to naming and URLs