Removed prefix from c++-only functions