Just a bit of OCD.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Merge branch 'develop' of github.com:dingo/api into develop
Merge branch 'develop' of github.com:dingo/api into develop
Namespace consistency, all are now singular.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>