Magic numbers and renaming