Fixed bug, renamed to work around bug in doxygen