restore mkl functionality
clean up names