Replace constants with matched static final fields