Replace two more hardcoded register constants with their respective name.