Rename + remove magic numbers.