Save some space (although not a lot)
fix rename