Several class renames to improve readability, in a particular consistency with Swagger terminology