Change social and episodic naming conventions

Make the Doxygen output a little more understandable