Fixed padding and renaming issue