renamed things to avoid name conflicts (velocity -> velocity1d, ...

velocity -> velocity1d, acceleration -> acceleration1d