Migrate suffixes properly

 * Fixes LT-15833.

Change-Id: I26743cae9bc52e7b72e9f7d5799a9db4e3c508c3