Fixed some bad URIs.
Fixed some incorectly named properties.
Merge branch 'feature/fixNames' into develop