Refactoring velocities, some file names