Changed the name and fixed a tiny bug in linking nonOptimized code