add 1D derivative and some name changing