Naming changes, refactored padding