Rename Const
Update test code