More consistent naming
Rendering based on accept header, logging