Name and padding fix

small fixes