Migrate some constants to interface values
Migrated some users of constants to interface values