rename swap_*s methods to swap_*_indices and make them public

Merged Janis Born requested to merge swap-indices-methods into master

Merge request reports