Update remaining models and services referenced by any API v1 as per #365 (closed) and #374 (closed).