Switching to short doxygen names.