Rename moving over padding

Do some renaming when moving over padding, so it hopefully does get more clear what is happening.