Rename + tweaking some numbers.